diff --git a/src/pystencils/backend/kernelcreation/cpu_optimization.py b/src/pystencils/backend/kernelcreation/cpu_optimization.py
index be9e50af3e75d1ce3626b0cf6abbc554bd162243..46fef660303fe9762383659883e62b9f2178bc71 100644
--- a/src/pystencils/backend/kernelcreation/cpu_optimization.py
+++ b/src/pystencils/backend/kernelcreation/cpu_optimization.py
@@ -22,8 +22,8 @@ def optimize_cpu(
     canonicalize = CanonicalizeSymbols(ctx, True)
     kernel_ast = cast(PsBlock, canonicalize(kernel_ast))
 
-    # hoist_invariants = HoistLoopInvariantDeclarations(ctx)
-    # kernel_ast = cast(PsBlock, hoist_invariants(kernel_ast))
+    hoist_invariants = HoistLoopInvariantDeclarations(ctx)
+    kernel_ast = cast(PsBlock, hoist_invariants(kernel_ast))
 
     if cfg is None:
         return kernel_ast
diff --git a/src/pystencils/backend/kernelcreation/typification.py b/src/pystencils/backend/kernelcreation/typification.py
index 2e81a0779f547f83b957b1baca328cd418dc2eef..3f69e12175e5aa12b94f696d13eecc628af845c2 100644
--- a/src/pystencils/backend/kernelcreation/typification.py
+++ b/src/pystencils/backend/kernelcreation/typification.py
@@ -24,7 +24,6 @@ from ..ast.structural import (
     PsExpression,
     PsAssignment,
     PsDeclaration,
-    PsStatement,
     PsEmptyLeafMixIn,
 )
 from ..ast.expressions import (
@@ -704,6 +703,7 @@ class Typifier:
                                     )
                                 items_tc.apply_dtype(deconstify(elem_type))
                                 tc.infer_dtype(expr)
+                                return None
 
                             case DereferencableTo(elem_type_or_hint):
                                 if isinstance(elem_type_or_hint, PsType):