diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin
index c9fddcaa..c77cff4a 100644
Binary files a/out/bins/ext_booter.bin and b/out/bins/ext_booter.bin differ
diff --git a/out/boot.dol b/out/boot.dol
index 371f535d..d21d66f7 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/booter/external_booter.cpp b/source/booter/external_booter.cpp
index 00561c32..77200cd5 100644
--- a/source/booter/external_booter.cpp
+++ b/source/booter/external_booter.cpp
@@ -148,9 +148,6 @@ void ExternalBooter_ChannelSetup(u64 title, bool dol)
 
 void ShutdownBeforeExit(void)
 {
-	DeviceHandle.UnMountAll();
-	NandHandle.DeInit_ISFS();
-	WDVD_Close();
 	Close_Inputs();
 	/* Deinit network */
 	if(networkInit == true)
@@ -165,4 +162,7 @@ void ShutdownBeforeExit(void)
 	}
 	/* Avoid issues on vWii by always calling this */
 	net_wc24cleanup();
+	NandHandle.DeInit_ISFS();
+	DeviceHandle.UnMountAll();
+	WDVD_Close();
 }
diff --git a/source/defines.h b/source/defines.h
index 75facb3d..de43190b 100644
--- a/source/defines.h
+++ b/source/defines.h
@@ -1,6 +1,6 @@
 
 #define APP_NAME				"WiiFlow WFL"
-#define APP_VERSION				"5.5.1"
+#define APP_VERSION				"5.5.2 beta 1"
 
 #define APP_DATA_DIR			"wiiflow"
 #define APPS_DIR				"apps/wiiflow"
diff --git a/source/devicemounter/DeviceHandler.cpp b/source/devicemounter/DeviceHandler.cpp
index d40d08a9..f70c8d9e 100644
--- a/source/devicemounter/DeviceHandler.cpp
+++ b/source/devicemounter/DeviceHandler.cpp
@@ -113,7 +113,7 @@ bool DeviceHandler::MountAllUSB()
 		return false;
 		
 	/* Kill possible USB thread */
-	//KillUSBKeepAliveThread();
+	KillUSBKeepAliveThread();
 
 	/* usb spinup - Wait for our slowass HDD */
 	if(WaitForDevice(GetUSBInterface()) == false)
@@ -134,8 +134,8 @@ bool DeviceHandler::MountAllUSB()
 	if(!result)
 		result = usb.Mount(0, DeviceName[USB1], true); /* Force FAT */
 
-	//if(result && usb_libogc_mode)
-	//	CreateUSBKeepAliveThread();
+	if(result && usb_libogc_mode)
+		CreateUSBKeepAliveThread();
 
 	return result;
 }
@@ -161,7 +161,7 @@ void DeviceHandler::UnMount(int dev)
 void DeviceHandler::UnMountAll()
 {
 	/* Kill possible USB thread */
-	//KillUSBKeepAliveThread();
+	KillUSBKeepAliveThread();
 
 	for(u32 i = SD; i < MAXDEVICES; i++)
 		UnMount(i);
diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp
index f29319cc..77271d0f 100644
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@@ -1167,7 +1167,7 @@ private:
 	bool _Home();
 	bool _ExitTo();
 	void _Shutdown();
-	bool _Boot();
+	void _Boot();
 	void _Paths();
 	void _sourceFlow();
 	int _getSrcFlow();
diff --git a/source/menu/menu_boot.cpp b/source/menu/menu_boot.cpp
index 57413a4d..ffe65566 100644
--- a/source/menu/menu_boot.cpp
+++ b/source/menu/menu_boot.cpp
@@ -76,12 +76,12 @@ void CMenu::_showBoot()
 	m_btnMgr.show(m_bootBtnSDOnly);
 }
 
-bool CMenu::_Boot(void)
+void CMenu::_Boot(void)
 {
 	if(isWiiVC)
 	{
 		error(_t("errboot7", L"Access denied in Wii VC mode."));
-		return false;
+		return;
 	}
 	set_port = currentPort;
 	bool prev_load = cur_load;
@@ -152,11 +152,9 @@ bool CMenu::_Boot(void)
 	if(prev_load != cur_load || prev_ios != cur_ios || set_port != currentPort || prev_sd != cur_sd)
 	{
 		error(_t("errboot8", L"Press 'A' to reload WiiFlow"));
-		m_exit = true;
-		m_reload = true;
-		return 1;
+		vector<string> arguments = _getMetaXML(fmt("%s/boot.dol", m_appDir.c_str()));
+		_launchHomebrew(fmt("%s/boot.dol", m_appDir.c_str()), arguments);
 	}
-	return 0;
 }
 
 void CMenu::_initBoot(void)
diff --git a/source/menu/menu_config_adv.cpp b/source/menu/menu_config_adv.cpp
index bb7ad5c1..bcc6fb5d 100644
--- a/source/menu/menu_config_adv.cpp
+++ b/source/menu/menu_config_adv.cpp
@@ -134,8 +134,7 @@ int CMenu::_configAdv(void)
 			if(m_btnMgr.selected(m_configAdvBtnBootChange))
 			{
 				_hideConfigAdv();
-				if(_Boot())
-					break; /* Settings changed */
+				_Boot();
 				_showConfigAdv();
 			}
 			else if(m_btnMgr.selected(m_configAdvBtnCurThemeP) || m_btnMgr.selected(m_configAdvBtnCurThemeM))
diff --git a/source/sicksaxis-wrapper/sicksaxis-wrapper.c b/source/sicksaxis-wrapper/sicksaxis-wrapper.c
index 1af01741..97c73c68 100644
--- a/source/sicksaxis-wrapper/sicksaxis-wrapper.c
+++ b/source/sicksaxis-wrapper/sicksaxis-wrapper.c
@@ -29,7 +29,7 @@ void DS3_Cleanup()
 {
 	psPressed = false;
 	ss_close(&Controller1);
-	USB_Deinitialize();
+	//USB_Deinitialize();
 }
 
 unsigned int DS3_ButtonsDown()