diff --git a/lib/TPP/DefaultPipeline.cpp b/lib/TPP/DefaultPipeline.cpp
index 78f6fa0f4..d17b033a0 100644
--- a/lib/TPP/DefaultPipeline.cpp
+++ b/lib/TPP/DefaultPipeline.cpp
@@ -206,13 +206,14 @@ struct DefaultPipeline : public tpp::impl::DefaultPipelineBase<DefaultPipeline>,
     pm.addPass(createAsyncRuntimeRefCountingPass());
     pm.addPass(createConvertAsyncToLLVMPass());
     pm.addPass(createConvertIndexToLLVMPass());
-    pm.addPass(createUBToLLVMConversionPass());
 
     pm.addPass(createConvertFuncToLLVMPass());
 
-    pm.addNestedPass<func::FuncOp>(createArithToLLVMConversionPass());
-    pm.addNestedPass<func::FuncOp>(createCanonicalizerPass());
-    pm.addNestedPass<func::FuncOp>(createCSEPass());
+    pm.addPass(createArithToLLVMConversionPass());
+    pm.addPass(createConvertControlFlowToLLVMPass());
+    pm.addPass(createUBToLLVMConversionPass());
+    pm.addPass(createCanonicalizerPass());
+    pm.addPass(createCSEPass());
     pm.addPass(createReconcileUnrealizedCastsPass());
 
     // Anything useful has been lowered by now.
diff --git a/test/GPU/CUDA/Integration/gpu-printf.mlir b/test/GPU/CUDA/Integration/gpu-printf.mlir
index 3002aaa09..9373a4a7f 100644
--- a/test/GPU/CUDA/Integration/gpu-printf.mlir
+++ b/test/GPU/CUDA/Integration/gpu-printf.mlir
@@ -9,7 +9,7 @@ module attributes {gpu.container_module} {
       %0 = gpu.thread_id x
       %csti8 = arith.constant 2 : i8
       %cstf32 = arith.constant 3.0 : f32
-      gpu.printf "Hello from %lld, %d, %f\n" %0, %csti8, %cstf32  : index, i8, f32
+      gpu.printf "Hello from %lld, %d, %f\n", %0, %csti8, %cstf32  : index, i8, f32
       gpu.return
     }
   }
diff --git a/test/GPU/set-spirv-abi-attr.mlir b/test/GPU/set-spirv-abi-attr.mlir
index 6496bb48e..89f24cc65 100644
--- a/test/GPU/set-spirv-abi-attr.mlir
+++ b/test/GPU/set-spirv-abi-attr.mlir
@@ -17,7 +17,7 @@ module attributes {gpu.container_module} {
       %b1 = gpu.block_id  y
       %t0 = gpu.thread_id  x
       %t1 = gpu.thread_id  y
-      gpu.printf "Block (%lld, %lld, 1) - Thread (%lld, %lld, 1)\n" %b0, %b1, %t0, %t1  : index, index, index, index
+      gpu.printf "Block (%lld, %lld, 1) - Thread (%lld, %lld, 1)\n", %b0, %b1, %t0, %t1  : index, index, index, index
       gpu.return
     }
   }
diff --git a/test/Passes/DefaultPipeline/default-pipeline.mlir b/test/Passes/DefaultPipeline/default-pipeline.mlir
index fd8118a86..18e300f22 100644
--- a/test/Passes/DefaultPipeline/default-pipeline.mlir
+++ b/test/Passes/DefaultPipeline/default-pipeline.mlir
@@ -9,8 +9,6 @@ func.func @matmul(%A: tensor<4x8xf32>,
 // CHECK: llvm.func @xsmm_gemm_invoke
 // CHECK: llvm.func @xsmm_gemm_dispatch
 // CHECK: llvm.func @matmul(%[[ARG0:.+]]: !llvm.ptr,
-// CHECK:   llvm.insertvalue
-// CHECK:   llvm.mlir.constant
 // CHECK:   llvm.call @xsmm_gemm_dispatch
 // CHECK:   llvm.call @xsmm_gemm_invoke
 // CHECK:   llvm.return