diff --git a/source/arm11/main.c b/source/arm11/main.c
index 0414255..795c63d 100644
--- a/source/arm11/main.c
+++ b/source/arm11/main.c
@@ -18,12 +18,10 @@
 {
 	hardwareInit();
 
-	while(1)
+	while(!g_startFirmLaunch)
 	{
 		waitForInterrupt();
 
-		if(g_startFirmLaunch) break;
-
 		hidScanInput();
 		const u32 kDown = hidKeysDown();
 		const u32 kUp = hidKeysUp();
diff --git a/source/arm9/start.s b/source/arm9/start.s
index fcbf889..b869f25 100644
--- a/source/arm9/start.s
+++ b/source/arm9/start.s
@@ -95,11 +95,11 @@
 	mov r0, #0                  @ argc
 	mov r1, #0                  @ argv
 	blx main
-	fail_loop:
+	_start_lp:
 		mov r0, #0
 		@ Wait for interrupt
 		mcr p15, 0, r0, c7, c0, 4
-		b fail_loop
+		b _start_lp
 .pool