diff --git a/HBC/META.XML b/HBC/META.XML
index 7adfda88..3d0cfac4 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.3 r1141</version>
-		<release_date>201112290822</release_date>
+		<version>2.3 r1142</version>
+		<release_date>201112301825</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index 022a5726..18bcbac4 100644
--- a/Languages/czech.lang
+++ b/Languages/czech.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@@ -1192,6 +1192,9 @@ msgstr "Žádný"
 msgid "Normal"
 msgstr "Normální"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Toto není Wii disk"
 
diff --git a/Languages/danish.lang b/Languages/danish.lang
index 163e55dd..b6f89bf0 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -1192,6 +1192,9 @@ msgstr "Ingen"
 msgid "Normal"
 msgstr "Normal"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Ikke en Wii-DVD"
 
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index 14240b60..e077e0b8 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2011-06-30 14:22+0100\n"
 "Last-Translator: glowy\n"
 "Language-Team: tj_cool, glowy\n"
@@ -1192,6 +1192,9 @@ msgstr "Geen"
 msgid "Normal"
 msgstr "Normaal"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Geen Wii disk"
 
diff --git a/Languages/english.lang b/Languages/english.lang
index 41b211c9..0203443d 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr ""
 
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index 93d379b8..f288a1c4 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr "Normaali"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Ei Wii-levy"
 
diff --git a/Languages/french.lang b/Languages/french.lang
index a942ad72..a53bdfae 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -1192,6 +1192,9 @@ msgstr "Aucun"
 msgid "Normal"
 msgstr "4:3"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Disque non Wii"
 
diff --git a/Languages/german.lang b/Languages/german.lang
index 73e6d7dd..99767046 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: TheRealVisitor\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@@ -1192,6 +1192,9 @@ msgstr "Keine"
 msgid "Normal"
 msgstr "Normal (4:3)"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Keine Wii Disk."
 
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index aec042e2..3bf94228 100644
--- a/Languages/hungarian.lang
+++ b/Languages/hungarian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr "Normális"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Nem Wii lemez"
 
diff --git a/Languages/italian.lang b/Languages/italian.lang
index aeedff64..e5c86642 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
 "Language-Team: Cambo\n"
@@ -1192,6 +1192,9 @@ msgstr "Nessuno"
 msgid "Normal"
 msgstr "Normale"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Non è un disco Wii"
 
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 07baadc7..ad377d83 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
@@ -1192,6 +1192,9 @@ msgstr "なし"
 msgid "Normal"
 msgstr "ワイド"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Wiiﾃﾞｨｽｸではありません"
 
diff --git a/Languages/korean.lang b/Languages/korean.lang
index 0f70dd2a..58a07a27 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr "일반"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Wii 디스크가 아닙니다"
 
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 862dd8f5..ea75c617 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -1192,6 +1192,9 @@ msgstr "Ingen"
 msgid "Normal"
 msgstr ""
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Ikke en Wii plate"
 
diff --git a/Languages/polish.lang b/Languages/polish.lang
index 867a384a..d0ea3a70 100644
--- a/Languages/polish.lang
+++ b/Languages/polish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr "Standardowe"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "To nie jest plyta Wii"
 
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index 13cbb7c9..005a369f 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-23 18:52+0200\n"
 "Last-Translator: aniemotion\n"
 "Language-Team: boto12, aniemotion\n"
@@ -1192,6 +1192,9 @@ msgstr "Nenhum"
 msgid "Normal"
 msgstr ""
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Não é um Disco do Wii"
 
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index b05b83fb..c0bc7f2d 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -1192,6 +1192,9 @@ msgstr "Nenhum"
 msgid "Normal"
 msgstr "Normal"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Não é um Disco da Wii"
 
diff --git a/Languages/russian.lang b/Languages/russian.lang
index e3882304..c86e2938 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr "Обычный"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Это не диск Wii"
 
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index 44bd2d79..98d5eeee 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: knife.hu kavid emul8ion\n"
 "Language-Team: kavid\n"
@@ -1192,6 +1192,9 @@ msgstr "无"
 msgid "Normal"
 msgstr "一般"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "不是 Wii 的光盘"
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index 4b20db18..e9e07093 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
@@ -1192,6 +1192,9 @@ msgstr "Ninguno"
 msgid "Normal"
 msgstr ""
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "No es un Disco Wii"
 
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index cb2af79d..5b296843 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr "Vanlig"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Inte en Wii-skiva"
 
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index 77b14814..e54077c7 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2010-02-15 21:00+0800\n"
 "Last-Translator: Jane.H\n"
 "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@@ -1192,6 +1192,9 @@ msgstr "沒有"
 msgid "Normal"
 msgstr "一般"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "不是 Wii 的光碟"
 
diff --git a/Languages/thai.lang b/Languages/thai.lang
index b4aba882..f6eda98b 100644
--- a/Languages/thai.lang
+++ b/Languages/thai.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr "ปกติ"
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "ไม่ใช่แผ่นเกมส์ Wii"
 
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index f451dc64..9a8778de 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:35+0100\n"
+"POT-Creation-Date: 2011-12-30 19:17+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -1192,6 +1192,9 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
+msgid "Not Initialized"
+msgstr ""
+
 msgid "Not a Wii Disc"
 msgstr "Wii Diski Değil"
 
diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp
index c8f080cf..54f03182 100644
--- a/source/menu/GameBrowseMenu.cpp
+++ b/source/menu/GameBrowseMenu.cpp
@@ -841,6 +841,13 @@ int GameBrowseMenu::MainLoop()
 	}
 	else if (installBtn->GetState() == STATE_CLICKED)
 	{
+		if(!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GAME_INSTALL))
+		{
+			WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" ));
+			installBtn->ResetState();
+			return MENU_NONE;
+		}
+
 		int choice = WindowPrompt(tr( "Install a game" ), 0, tr( "Yes" ), tr( "No" ));
 		if (choice == 1)
 		{
@@ -1225,15 +1232,7 @@ void GameBrowseMenu::CheckDiscSlotUpdate()
 	{
 		int choice = WindowPrompt(tr( "Disc Insert Detected" ), 0, tr( "Install" ), tr( "Mount DVD drive" ), tr( "Cancel" ));
 		if (choice == 1)
-		{
-			if(!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GAME_INSTALL))
-			{
-				WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" ));
-				return;
-			}
-
-			returnMenu = MenuInstall();
-		}
+			installBtn->SetState(STATE_CLICKED);
 		else if (choice == 2)
 			dvdBtn->SetState(STATE_CLICKED);
 	}
diff --git a/source/patches/patchcode.c b/source/patches/patchcode.c
index 9a57f8d2..09b94a8b 100644
--- a/source/patches/patchcode.c
+++ b/source/patches/patchcode.c
@@ -41,7 +41,7 @@ static u8 *codelistend = (u8 *) 0x80003000;
 static u8 *codelist = (u8 *) 0x800022A8;
 
 static u8 *code_buf = NULL;
-static int code_size = 0;
+static u32 code_size = 0;
 
 static u32 gameconfsize = 0;
 static u32 *gameconf = NULL;
@@ -541,6 +541,14 @@ static void app_loadgameconfig()
 
 	if(tempgameconf != defaultgameconfig)
 		free(tempgameconf);
+
+	if (code_size > (u32) codelistend - (u32) codelist)
+	{
+		gprintf("Ocarina: Too many codes found: filesize %i, maxsize: %i\n", code_size, (u32) codelistend - (u32) codelist);
+		MEM2_free(code_buf);
+		code_buf = NULL;
+		code_size = 0;
+	}
 }
 
 //---------------------------------------------------------------------------------
@@ -660,6 +668,7 @@ void load_handler(u32 hooktype, u32 debugger, u32 pauseAtStart)
 		DCFlushRange(codelist, (u32) codelistend - (u32) codelist);
 		free(code_buf);
 		code_buf = NULL;
+		gprintf("Ocarina codes applied to %p size: %i\n", codelist, (u32) codelistend - (u32) codelist);
 	}
 
 	if(hooktype != 0x00)
@@ -760,7 +769,7 @@ int ocarina_load_code(const char *CheatFilepath, u8 *gameid)
 
 	fclose(fp);
 
-	if (code_size <= 0)
+	if (code_size == 0)
 	{
 		gprintf("Ocarina: could not read file.\n");
 		MEM2_free(code_buf);
@@ -769,15 +778,6 @@ int ocarina_load_code(const char *CheatFilepath, u8 *gameid)
 		return 0;
 	}
 
-	if (code_size > (s32) codelistend - (s32) codelist)
-	{
-		gprintf("Ocarina: Too many codes found\n");
-		MEM2_free(code_buf);
-		code_buf = NULL;
-		code_size = 0;
-		return 0;
-	}
-
 	gprintf("Ocarina: Codes found.\n");
 
 	LoadGameConfig(CheatFilepath);
diff --git a/source/settings/menus/HardDriveSM.cpp b/source/settings/menus/HardDriveSM.cpp
index f8d00afc..4727bfe6 100644
--- a/source/settings/menus/HardDriveSM.cpp
+++ b/source/settings/menus/HardDriveSM.cpp
@@ -127,7 +127,10 @@ void HardDriveSM::SetOptionValues()
 	int checkPart = DeviceHandler::PartitionToPortPartition(Settings.partition);
 
 	//! Get the partition name and it's size in GB's
-	Options->SetValue(Idx++, "%s (%.2fGB)", usbHandle->GetFSName(checkPart), usbHandle->GetSize(checkPart)/GB_SIZE);
+	if(usbHandle)
+		Options->SetValue(Idx++, "%s (%.2fGB)", usbHandle->GetFSName(checkPart), usbHandle->GetSize(checkPart)/GB_SIZE);
+	else
+		Options->SetValue(Idx++, tr("Not Initialized"));
 
 	//! Settings: Multiple Partitions
 	Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.MultiplePartitions] ));
diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp
index e514f01b..fe0c5979 100644
--- a/source/system/IosLoader.cpp
+++ b/source/system/IosLoader.cpp
@@ -180,16 +180,20 @@ void IosLoader::LoadIOSModules(s32 ios, s32 ios_rev)
 	//! Waninkoko IOS
 	else if(IsWaninkokoIOS(ios))
 	{
+		// Init ISFS for d2x check
+		ISFS_Initialize();
+
 		iosinfo_t *info = GetIOSInfo(ios);
 		if(ios_rev >= 18 && (!info || info->version < 6))
 		{
-			if(mload_init() < 0)
-				return;
-
-			gprintf("Loading dip module for Waninkoko's cios\n");
-			mload_module((u8 *) dip_plugin_249, dip_plugin_249_size);
-			mload_close();
+			if(mload_init() >= 0)
+			{
+				gprintf("Loading dip module for Waninkoko's cios\n");
+				mload_module((u8 *) dip_plugin_249, dip_plugin_249_size);
+				mload_close();
+			}
 		}
+		ISFS_Deinitialize();
 	}
 }
 
diff --git a/source/usbloader/wbfs.cpp b/source/usbloader/wbfs.cpp
index c766dc7f..161effd7 100644
--- a/source/usbloader/wbfs.cpp
+++ b/source/usbloader/wbfs.cpp
@@ -51,7 +51,8 @@ s32 WBFS_Init(u32 device)
 s32 WBFS_ReInit(u32 device)
 {
 	WBFS_CloseAll();
-
+	DeviceHandler::Instance()->UnMountAllUSB();
+	DeviceHandler::Instance()->MountAllUSB();
 	s32 ret = -1;
 
 	if(Settings.MultiplePartitions)