diff --git a/pystencils/kernel_contrains_check.py b/pystencils/kernel_contrains_check.py
index f79677656874dbe14c7bf7658e6b9534a6be18c1..b4b681e1c9cc233e94bd10d5f38f76eb8d34e220 100644
--- a/pystencils/kernel_contrains_check.py
+++ b/pystencils/kernel_contrains_check.py
@@ -54,12 +54,15 @@ class KernelConstraintsCheck:
             # Disable double write check inside conditionals
             # would be triggered by e.g. in-kernel boundaries
             old_double_write = self.check_double_write_condition
+            old_independence_condition = self.check_independence_condition
             self.check_double_write_condition = False
+            self.check_independence_condition = False
             if obj.false_block:
                 self.visit(obj.false_block)
             self.process_expression(obj.condition_expr)
             self.process_expression(obj.true_block)
             self.check_double_write_condition = old_double_write
+            self.check_independence_condition = old_independence_condition
             self.scopes.pop()
         elif isinstance(obj, ast.Block):
             self.scopes.push()
diff --git a/pystencils/kernelcreation.py b/pystencils/kernelcreation.py
index cd744a0d9ad318792c7f6318bee3fbd41aa4746a..4b02ca13dfd66731747d80978770d976993f61cc 100644
--- a/pystencils/kernelcreation.py
+++ b/pystencils/kernelcreation.py
@@ -75,7 +75,7 @@ def create_kernel(assignments: Union[Assignment, List[Assignment], AssignmentCol
             warnings.warn(f"It was not possible to apply the default pystencils optimisations to the "
                           f"AssignmentCollection due to the following problem :{e}")
         simplification_hints = assignments.simplification_hints
-        assignments = NodeCollection(assignments.all_assignments)
+        assignments = NodeCollection.from_assignment_collection(assignments)
         assignments.simplification_hints = simplification_hints
 
     if config.index_fields:
diff --git a/pystencils/node_collection.py b/pystencils/node_collection.py
index b393df0ede2598638707974e19533a2bef735fcd..821eda99b7f08c8f052c1f204ad672bb807492fd 100644
--- a/pystencils/node_collection.py
+++ b/pystencils/node_collection.py
@@ -31,7 +31,16 @@ class NodeCollection:
 
     @staticmethod
     def from_assignment_collection(assignment_collection: AssignmentCollection):
-        return NodeCollection([SympyAssignment(a.lhs, a.rhs) for a in assignment_collection.all_assignments])
+        nodes = list()
+        for assignemt in assignment_collection.all_assignments:
+            if isinstance(assignemt, Assignment):
+                nodes.append(SympyAssignment(assignemt.lhs, assignemt.rhs))
+            elif isinstance(assignemt, Node):
+                nodes.append(assignemt)
+            else:
+                raise ValueError(f"Unknown node in the AssignmentCollection: {assignemt}")
+
+        return NodeCollection(nodes)
 
     def evaluate_terms(self):
         evaluate_constant_terms = ReplaceOptim(
diff --git a/pystencils/typing/cast_functions.py b/pystencils/typing/cast_functions.py
index 1b83d223cbff2ce08c1fc0516d2ce53dc2ec350a..9e9ad372e3a37a3b521e27b64040945fd093f762 100644
--- a/pystencils/typing/cast_functions.py
+++ b/pystencils/typing/cast_functions.py
@@ -89,6 +89,7 @@ class CastFunc(sp.Function):
         else:
             return super().is_nonnegative
 
+
     @property
     def is_real(self):
         """
diff --git a/pystencils/typing/utilities.py b/pystencils/typing/utilities.py
index c5612e935e04c8e30968f527dd468e88933372e1..da40c510ef91c7ca7fee0e6a0259b3eef50f0ab8 100644
--- a/pystencils/typing/utilities.py
+++ b/pystencils/typing/utilities.py
@@ -129,8 +129,6 @@ def get_type_of_expression(expr,
     expr = sp.sympify(expr)
     if isinstance(expr, sp.Integer):
         return create_type(default_int_type)
-    elif expr.is_real is False:
-        return create_type((np.zeros((1,), default_float_type) * 1j).dtype)
     elif isinstance(expr, sp.Rational) or isinstance(expr, sp.Float):
         return create_type(default_float_type)
     elif isinstance(expr, ResolvedFieldAccess):