diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp
index eb5cf371c..58de9d36a 100644
--- a/src/llvm_backend_general.cpp
+++ b/src/llvm_backend_general.cpp
@@ -853,7 +853,9 @@ void lb_emit_store(lbProcedure *p, lbValue ptr, lbValue value) {
 
 	if (LLVMIsNull(value.value)) {
 		LLVMTypeRef src_t = llvm_addr_type(p->module, ptr);
-		if (lb_sizeof(src_t) <= lb_max_zero_init_size()) {
+		if (is_type_proc(a)) {
+			LLVMBuildStore(p->builder, LLVMConstNull(llvm_get_element_type(LLVMTypeOf(ptr.value))), ptr.value);
+		} else if (lb_sizeof(src_t) <= lb_max_zero_init_size()) {
 			LLVMBuildStore(p->builder, LLVMConstNull(src_t), ptr.value);
 		} else {
 			lb_mem_zero_ptr(p, ptr.value, a, 1);
diff --git a/src/llvm_backend_opt.cpp b/src/llvm_backend_opt.cpp
index 6b80b21d6..e2f51b868 100644
--- a/src/llvm_backend_opt.cpp
+++ b/src/llvm_backend_opt.cpp
@@ -62,7 +62,9 @@ void lb_basic_populate_function_pass_manager(LLVMPassManagerRef fpm, i32 optimiz
 		LLVMAddPromoteMemoryToRegisterPass(fpm);
 		LLVMAddMergedLoadStoreMotionPass(fpm);
 		LLVM_ADD_CONSTANT_VALUE_PASS(fpm);
-		LLVMAddEarlyCSEPass(fpm);
+		if (!build_context.ODIN_DEBUG) {
+			LLVMAddEarlyCSEPass(fpm);
+		}
 	}
 }