diff --git a/source/arm11/start.s b/source/arm11/start.s
index 0b161cf..38d6065 100644
--- a/source/arm11/start.s
+++ b/source/arm11/start.s
@@ -71,6 +71,10 @@
 	bl stubExceptionVectors     @ Stub the vectors in AXIWRAM bootrom vectors jump to
 
 	mov sp, #0                  @ SVC mode sp (Unused, aborts)
+	cpsid aif, #0x17            @ Abort mode
+	mov sp, #0                  @ Not yet
+	cpsid aif, #0x1B            @ Undefined mode
+	mov sp, #0                  @ Not yet
 	cpsid aif, #0x11            @ FIQ mode
 	mov sp, #0                  @ Not yet
 	cpsid aif, #0x12            @ IRQ mode
diff --git a/source/arm9/start.s b/source/arm9/start.s
index 11e83a6..4797905 100644
--- a/source/arm9/start.s
+++ b/source/arm9/start.s
@@ -310,7 +310,7 @@
 
 
 deinitCpu:
-	msr cpsr_cxsf, #0xDF        @ System mode
+	msr cpsr, #0xDF             @ System mode
 	mov r3, lr
 
 	@ Stub vectors to endless loops