diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin
index a9e58b5b..ac1fb727 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 e24228bd..b21b148d 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/defines.h b/source/defines.h
index 63394d71..0633072e 100644
--- a/source/defines.h
+++ b/source/defines.h
@@ -1,6 +1,6 @@
 
 #define APP_NAME				"WiiFlow WFL"
-#define APP_VERSION				"5.5.4 beta 3"
+#define APP_VERSION				"5.5.4"
 
 #define APP_DATA_DIR			"wiiflow"
 #define APPS_DIR				"apps/wiiflow"
diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index ec0062e8..ca2edc1c 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -2055,7 +2055,10 @@ void CMenu::_initCF(void)
 		memset(cfgKey2, 0, 74);
 		
 		if(hdr->type == TYPE_HOMEBREW)
+		{
 			wcstombs(cfgKey1, hdr->title, 63);// uses title which is the folder name in apps.
+			wcstombs(catKey1, hdr->title, 63);
+		}
 		else if(hdr->type == TYPE_PLUGIN)
 		{
 			strncpy(m_plugin.PluginMagicWord, fmt("%08x", hdr->settings[0]), 8);
@@ -2556,6 +2559,7 @@ bool CMenu::_loadPluginList()
 {
 	bool updateCache = m_cfg.getBool(PLUGIN_DOMAIN, "update_cache");
 	gprintf("Adding plugins list\n");
+	bool channels_done = false;
 	for(u8 i = 0; m_plugin.PluginExist(i); ++i)
 	{
 		if(!m_plugin.GetEnabledStatus(i))
@@ -2588,8 +2592,9 @@ bool CMenu::_loadPluginList()
 					m_cfg.setBool(WII_DOMAIN, "update_cache", true);
 				_loadWiiList();
 			}
-			else if(strncasecmp(m_plugin.PluginMagicWord, NAND_PMAGIC, 8) == 0 || strncasecmp(m_plugin.PluginMagicWord, ENAND_PMAGIC, 8) == 0)//NAND
+			else if(!channels_done && (strncasecmp(m_plugin.PluginMagicWord, NAND_PMAGIC, 8) == 0 || strncasecmp(m_plugin.PluginMagicWord, ENAND_PMAGIC, 8) == 0))//NAND
 			{
+				channels_done = true;
 				if(updateCache)
 					m_cfg.setBool(CHANNEL_DOMAIN, "update_cache", true);
 				_loadChannelList();