diff --git a/source/list/list.cpp b/source/list/list.cpp
index 8634a9c1..9fd34127 100644
--- a/source/list/list.cpp
+++ b/source/list/list.cpp
@@ -413,7 +413,6 @@ void CList<dir_discHdr>::GetChannels(vector<dir_discHdr> &headerlist, string set
 	}
 
 	u32 count = m_channels.Count();
-	gprintf("PFFF: Channel count: %d\n", count);
 
 	headerlist.reserve(count);
 
diff --git a/source/menu/menu_config_game.cpp b/source/menu/menu_config_game.cpp
index 2f71f874..8c1cddc3 100644
--- a/source/menu/menu_config_game.cpp
+++ b/source/menu/menu_config_game.cpp
@@ -347,8 +347,11 @@ void CMenu::_showGameSettings(void)
 		{
 			m_btnMgr.show(m_gameSettingsLblCustom);
 			m_btnMgr.show(m_gameSettingsBtnCustom);
-			m_btnMgr.show(m_gameSettingsLblLaunchNK);
-			m_btnMgr.show(m_gameSettingsBtnLaunchNK);
+			if(m_cfg.getInt("NAND", "partition", 0) == 1)
+			{
+				m_btnMgr.show(m_gameSettingsLblLaunchNK);
+				m_btnMgr.show(m_gameSettingsBtnLaunchNK);
+			}
 		}
 		else if(m_cf.getHdr()->type == TYPE_WII_GAME)
 		{
diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index 54fe177e..3337152b 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -1075,6 +1075,9 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 	m_cat.save(true);
 	m_cfg.save(true);
 	cleanup();
+	
+	if(useNK2o && emuPartition != 1)
+		useNK2o = false;
 
 	if(useNK2o && !emu_disabled)
 	{
diff --git a/wiiflow.pnps b/wiiflow.pnps
index c0712a13..f3871f27 100644
--- a/wiiflow.pnps
+++ b/wiiflow.pnps
@@ -1 +1 @@
-<pd><ViewState><e p="Wiiflow" x="true"></e><e p="Wiiflow\resources" x="false"></e><e p="Wiiflow\data" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow\source" x="true"></e><e p="Wiiflow\source\network" x="false"></e><e p="Wiiflow\source\channel" x="false"></e><e p="Wiiflow\source\menu" x="true"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\source\banner" x="false"></e><e p="Wiiflow\source\cheats" x="false"></e><e p="Wiiflow\source\config" x="false"></e><e p="Wiiflow\source\devicemounter" x="false"></e><e p="Wiiflow\source\fileOps" x="false"></e><e p="Wiiflow\source\gc" x="false"></e><e p="Wiiflow\source\gecko" x="false"></e><e p="Wiiflow\source\gui" x="false"></e><e p="Wiiflow\source\homebrew" x="false"></e><e p="Wiiflow\source\libwbfs" x="false"></e><e p="Wiiflow\source\list" x="false"></e><e p="Wiiflow\source\loader" x="true"></e><e p="Wiiflow\source\memory" x="false"></e><e p="Wiiflow\source\music" x="false"></e><e p="Wiiflow\source\plugin" x="false"></e><e p="Wiiflow\source\unzip" x="false"></e><e p="Wiiflow\source\wstringEx" x="false"></e><e p="Wiiflow\wii" x="false"></e></ViewState></pd>
\ No newline at end of file
+<pd><ViewState><e p="Wiiflow" x="true"></e><e p="Wiiflow\resources" x="false"></e><e p="Wiiflow\data" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow\source" x="true"></e><e p="Wiiflow\source\network" x="false"></e><e p="Wiiflow\source\channel" x="false"></e><e p="Wiiflow\source\menu" x="true"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\source\banner" x="false"></e><e p="Wiiflow\source\cheats" x="false"></e><e p="Wiiflow\source\config" x="false"></e><e p="Wiiflow\source\devicemounter" x="false"></e><e p="Wiiflow\source\fileOps" x="false"></e><e p="Wiiflow\source\gc" x="false"></e><e p="Wiiflow\source\gecko" x="false"></e><e p="Wiiflow\source\gui" x="false"></e><e p="Wiiflow\source\homebrew" x="false"></e><e p="Wiiflow\source\libwbfs" x="false"></e><e p="Wiiflow\source\list" x="true"></e><e p="Wiiflow\source\loader" x="true"></e><e p="Wiiflow\source\memory" x="false"></e><e p="Wiiflow\source\music" x="false"></e><e p="Wiiflow\source\plugin" x="false"></e><e p="Wiiflow\source\unzip" x="false"></e><e p="Wiiflow\source\wstringEx" x="false"></e><e p="Wiiflow\wii" x="false"></e></ViewState></pd>
\ No newline at end of file