diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index 13dde7b3..5d9765c2 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -186,17 +186,17 @@ TitleProperty *SYSM_ReadParameters( void )
     //-----------------------------------------------------
     // ノーマル情報リード
     if( !LCFG_ReadHWNormalInfo() ) {
-#ifndef SYSM_IGNORE_RESULT_HWINFO
+#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
         OS_TPrintf( "HW Normal Info Broken!\n" );
         UTL_SetFatalError( FATAL_ERROR_HWINFO_NORMAL );
-#endif // SYSM_IGNORE_RESULT_HWINFO
+#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
     }
     // セキュア情報リード
     if( !LCFG_ReadHWSecureInfo() ) {
-#ifndef SYSM_IGNORE_RESULT_HWINFO
+#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
         OS_TPrintf( "HW Secure Info Broken!\n" );
         UTL_SetFatalError( FATAL_ERROR_HWINFO_SECURE );
-#endif // SYSM_IGNORE_RESULT_HWINFO
+#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
     }
 
 	//-----------------------------------------------------
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index 5226bd57..20b44727 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -376,12 +376,12 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
     u8 *pSecBuf = NULL;
     u8 *pHdrBuf = NULL;
 
+	ROM_Header_Short *header = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF;
+	
 #if defined(SYSM_DISABLE_WLFIRM_LOAD) || defined(SYSM_BUILD_FOR_PRODUCTION_TEST)
 	return TRUE;
 #endif // SYSM_DISABLE_WLFIRM_LOAD || SYSM_BUILD_FOR_PRODUCTION_TEST
 
-	ROM_Header_Short *header = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF;
-	
 	if( header->titleID_Lo[3] == '4' )
 	{
 		OS_TPrintf("[Wlan Firm]  This is DEV_UIG_Launcher. Wireless firmware download skipped.\n");