diff --git a/source/arm11/start.s b/source/arm11/start.s
index 191eef5..c796387 100644
--- a/source/arm11/start.s
+++ b/source/arm11/start.s
@@ -103,16 +103,16 @@
 	ands r4, r4, #3
 	bleq stubExceptionVectors   @ Stub the vectors in AXIWRAM bootrom vectors jump to
 
-	mov sp, #0                  @ SVC mode sp (unused, aborts)
-	cpsid aif, #23              @ Abort mode
+	mov sp, #0                  @ unused SVC mode sp
+	cps #23                     @ Abort mode
 	ldr sp, =A11_EXC_STACK_END
-	cpsid aif, #27              @ Undefined mode
+	cps #27                     @ Undefined mode
 	ldr sp, =A11_EXC_STACK_END
-	cpsid aif, #17              @ FIQ mode
+	cps #17                     @ FIQ mode
 	mov sp, #0                  @ Unused
-	cpsid aif, #18              @ IRQ mode
-	mov sp, #0                  @ IRQ mode stack is not needed
-	cpsid aif, #31              @ System mode
+	cps #18                     @ IRQ mode
+	mov sp, #0                  @ not needed
+	cps #31                     @ System mode
 	adr r2, _sysmode_stacks
 	ldr sp, [r2, r4, lsl #2]
 
diff --git a/source/arm9/start.s b/source/arm9/start.s
index d4d72d7..cf2f239 100644
--- a/source/arm9/start.s
+++ b/source/arm9/start.s
@@ -81,7 +81,7 @@
 	bl setupExceptionVectors    @ Setup the vectors in ARM9 mem bootrom vectors jump to
 	bl setupTcms                @ Setup and enable DTCM and ITCM
 
-	mov sp, #0                  @ SVC mode sp (Unused, aborts)
+	mov sp, #0                  @ unused SVC mode sp
 	msr cpsr_cxsf, #0xD7        @ Abort mode
 	mov sp, #A9_EXC_STACK_END
 	msr cpsr_cxsf, #0xDB        @ Undefined mode