diff --git a/build/libraries/os/common/os_boot.c b/build/libraries/os/common/os_boot.c
index 55265c3c..30496753 100644
--- a/build/libraries/os/common/os_boot.c
+++ b/build/libraries/os/common/os_boot.c
@@ -113,6 +113,8 @@ void OS_BootWithRomHeaderFromFIRM( ROM_Header* rom_header )
 #endif
     mem_list[i++] = NULL;
     SDK_ASSERT(i <= sizeof(mem_list)/sizeof(mem_list[0]));
+#ifndef FIRM_FOR_CTR
+    // CTRでは互換カーネルへ内包させるため開発鍵を許可
 #ifndef FIRM_USE_PRODUCT_KEYS
     // 開発鍵を使っている時は量産用CPUではブートしない
 #ifdef SDK_ARM9
@@ -131,6 +133,7 @@ void OS_BootWithRomHeaderFromFIRM( ROM_Header* rom_header )
     {
         OS_Terminate();
     }
+#endif // FIRM_FOR_CTR
     REBOOTi_EnableCtrFirm();
     REBOOT_Execute(entry, wram_reg, mem_list, code_buf, stack_top, target, scfg, set_jtag, forbid_jtag, psram_4mb);
     OS_Terminate();
diff --git a/build/libraries/os/common/os_init_firm.c b/build/libraries/os/common/os_init_firm.c
index 3e2763a6..6e93ec89 100644
--- a/build/libraries/os/common/os_init_firm.c
+++ b/build/libraries/os/common/os_init_firm.c
@@ -167,6 +167,8 @@ void OS_InitFIRM(void)
 
 #endif // SDK_ARM9
 
+#ifndef FIRM_FOR_CTR
+    // CTRでは互換カーネルへ内包させるため開発鍵を許可
 #ifndef FIRM_USE_PRODUCT_KEYS
     // 開発鍵を使っている時は量産用CPUでは起動しない
 #ifdef SDK_ARM9
@@ -185,6 +187,7 @@ void OS_InitFIRM(void)
     {
         OS_Terminate();
     }
+#endif // FIRM_FOR_CTR
 }
 
 #pragma profile reset
diff --git a/build/nandfirm/menu-launcher/wram_regs/Makefile b/build/nandfirm/menu-launcher/wram_regs/Makefile
index 76342425..8944f863 100644
--- a/build/nandfirm/menu-launcher/wram_regs/Makefile
+++ b/build/nandfirm/menu-launcher/wram_regs/Makefile
@@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------
 
 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TARGET_CODEGEN		:= ALL
 override TWL_ARCHGEN		:= LIMITED
 
 override TARGET_FINALROM	:= TRUE