diff --git a/bootstrap/crystal/ast.cr b/bootstrap/crystal/ast.cr
index 1fdbed84e256e00a493e8688e18c9e399291179f..9ea097a82139d360e2f1bc0984f9a36d57e355c6 100644
--- a/bootstrap/crystal/ast.cr
+++ b/bootstrap/crystal/ast.cr
@@ -391,7 +391,9 @@ module Crystal
     end
 
     def clone_without_location
-      If.new(@cond.clone, @then.clone, @else.clone)
+      a_if = If.new(@cond.clone, @then.clone, @else.clone)
+      a_if.binary = binary
+      a_if
     end
   end
 
diff --git a/bootstrap/crystal/codegen.cr b/bootstrap/crystal/codegen.cr
index 9ebc4176ad9691f490b72f6c809c9b48067bac6c..2156d373f582b0ac9cb3bd4e08f9ed2d43ae490c 100644
--- a/bootstrap/crystal/codegen.cr
+++ b/bootstrap/crystal/codegen.cr
@@ -652,6 +652,17 @@ module Crystal
       false
     end
 
+    def visit(node : SimpleOr)
+      node.left.accept self
+      left = codegen_cond(node.left.type)
+
+      node.right.accept self
+      right = codegen_cond(node.right.type)
+
+      @last = @builder.or left, right
+      false
+    end
+
     def visit(node : ASTNode)
       true
     end
@@ -917,6 +928,11 @@ module Crystal
     end
 
     def codegen_cond_branch(node_cond, then_block, else_block)
+      unless node_cond.type?
+        puts node_cond
+        puts node_cond.location
+      end
+
       @builder.cond(codegen_cond(node_cond.type), then_block, else_block)
 
       nil
diff --git a/bootstrap/crystal/type_inference.cr b/bootstrap/crystal/type_inference.cr
index 11c3f1802dcd7b03a188915eff3a0b885efc20c0..4ee7989a56e3b9d176f3467994067d518b6ff853 100644
--- a/bootstrap/crystal/type_inference.cr
+++ b/bootstrap/crystal/type_inference.cr
@@ -342,7 +342,7 @@ module Crystal
         block_vars[arg.name] = arg
       end
 
-      block_visitor = TypeVisitor.new(mod, block_vars, (node.scope || @scope), @parent, @call, @owner, @untyped_def, @typed_def, @arg_types, @free_vars, @yield_vars) #, @type_filter_stack)
+      block_visitor = TypeVisitor.new(mod, block_vars, (node.scope || @scope), @parent, @call, @owner, @untyped_def, @typed_def, @arg_types, @free_vars, @yield_vars, @type_filter_stack)
       block_visitor.block = node
       node.body.accept block_visitor
       false
@@ -415,6 +415,13 @@ module Crystal
       node.type = mod.fun_of(types)
     end
 
+    def end_visit(node : SimpleOr)
+      node.bind_to node.left
+      node.bind_to node.right
+
+      false
+    end
+
     def visit(node : Call)
       prepare_call(node)
 
diff --git a/bootstrap/crystal/type_inference/call.cr b/bootstrap/crystal/type_inference/call.cr
index 0a64a8c70358e139db2d35f6e294085736c54b7f..26b738ca87e19dd0c713c3fa76a44aa2ff875834 100644
--- a/bootstrap/crystal/type_inference/call.cr
+++ b/bootstrap/crystal/type_inference/call.cr
@@ -108,6 +108,10 @@ module Crystal
         end
       end
 
+      if matches.empty? && owner.class? && owner.abstract
+        matches = owner.hierarchy_type.lookup_matches(def_name, arg_types, !!block)
+      end
+
       if matches.empty?
         # For now, if the owner is a NoReturn just ignore the error (this call should be recomputed later)
         unless owner.no_return?
diff --git a/bootstrap/crystal/types.cr b/bootstrap/crystal/types.cr
index 14a25c5c17a967c09aea932335b49484412efcdf..e096bbba147fd040b79bb3d2fae5d86159f47353 100644
--- a/bootstrap/crystal/types.cr
+++ b/bootstrap/crystal/types.cr
@@ -1072,6 +1072,7 @@ module Crystal
     delegate owned_instance_vars, @generic_class
     delegate instance_vars_in_initialize, @generic_class
     delegate macros, @generic_class
+    delegate :abstract, @generic_class
 
     def class?
       true