diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c
index 79df2d42..835f6998 100644
--- a/build/nandfirm/menu-launcher/ARM7/main.c
+++ b/build/nandfirm/menu-launcher/ARM7/main.c
@@ -113,14 +113,17 @@ void TwlSpMain( void )
     OS_SetDebugLED(++step);
 
     /* FATFSライブラリ用にカレントヒープに設定 */
+    {
     {
         OSHeapHandle hh;
         u8     *lo = (u8*)fatfsHeap;
         u8     *hi = (u8*)fatfsHeap + FATFS_HEAP_SIZE;
         lo = OS_InitAlloc(OS_ARENA_MAIN_SUBPRIV, lo, hi, 1);
-        hh = OS_CreateHeap(OS_ARENA_MAIN_SUBPRIV, lo + 32, hi - 32);
+        OS_SetArenaLo(OS_ARENA_MAIN_SUBPRIV, lo);
+        hh = OS_CreateHeap(OS_ARENA_MAIN_SUBPRIV, OS_GetSubPrivArenaLo(), hi);
         OS_SetCurrentHeap(OS_ARENA_MAIN_SUBPRIV, hh);
     }
+    }
 
     OS_SetDebugLED(++step);
 
diff --git a/build/nandfirm/menu-launcher/ARM9/Makefile b/build/nandfirm/menu-launcher/ARM9/Makefile
index 2715df6b..2298c891 100644
--- a/build/nandfirm/menu-launcher/ARM9/Makefile
+++ b/build/nandfirm/menu-launcher/ARM9/Makefile
@@ -1,6 +1,6 @@
 #! make -f
 #----------------------------------------------------------------------------
-# Project:  TwlFirm - tools - nandfirm-loader
+# Project:  TwlFirm - nandfirm - menu-launcher
 # File:     Makefile
 #
 # Copyright 2007 Nintendo.  All rights reserved.
diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c
index bbe8c582..bf39d5e9 100644
--- a/build/nandfirm/sdmc-launcher/ARM7/main.c
+++ b/build/nandfirm/sdmc-launcher/ARM7/main.c
@@ -121,7 +121,8 @@ void TwlSpMain( void )
         u8     *lo = (u8*)fatfsHeap;
         u8     *hi = (u8*)fatfsHeap + FATFS_HEAP_SIZE;
         lo = OS_InitAlloc(OS_ARENA_MAIN_SUBPRIV, lo, hi, 1);
-        hh = OS_CreateHeap(OS_ARENA_MAIN_SUBPRIV, lo + 32, hi - 32);
+        OS_SetArenaLo(OS_ARENA_MAIN_SUBPRIV, lo);
+        hh = OS_CreateHeap(OS_ARENA_MAIN_SUBPRIV, OS_GetSubPrivArenaLo(), hi);
         OS_SetCurrentHeap(OS_ARENA_MAIN_SUBPRIV, hh);
     }