diff --git a/common/include/NintendontVersion.h b/common/include/NintendontVersion.h
index b9d8196b3..8d9df9675 100644
--- a/common/include/NintendontVersion.h
+++ b/common/include/NintendontVersion.h
@@ -2,7 +2,7 @@
 #define __NINTENDONT_VERSION_H__
 
 #define NIN_MAJOR_VERSION			6
-#define NIN_MINOR_VERSION			507
+#define NIN_MINOR_VERSION			508
 
 #define NIN_VERSION		((NIN_MAJOR_VERSION << 16) | NIN_MINOR_VERSION)
 
diff --git a/kernel/Config.c b/kernel/Config.c
index 3bbae7ff6..0f049da57 100644
--- a/kernel/Config.c
+++ b/kernel/Config.c
@@ -41,7 +41,6 @@ void ConfigInit( void )
 	if( IsWiiU() )
 	{
 		//ncfg->Config |= NIN_CFG_HID;
-		ncfg->MaxPads = 0;
 
 		// Disable debugging and the drive access LED.
 		ncfg->Config &= ~(NIN_CFG_DEBUGGER | NIN_CFG_DEBUGWAIT | NIN_CFG_LED);
diff --git a/kernel/Patch.c b/kernel/Patch.c
index 5045cd884..176f8abdb 100644
--- a/kernel/Patch.c
+++ b/kernel/Patch.c
@@ -1657,7 +1657,7 @@ void DoPatches( char *Buffer, u32 Length, u32 DiscOffset )
 		}
 	}
 	DisableEXIPatch = (TRIGame == TRI_NONE && ConfigGetConfig(NIN_CFG_MEMCARDEMU) == false);
-	DisableSIPatch = (!IsWiiU() && TRIGame == TRI_NONE && ConfigGetConfig(NIN_CFG_NATIVE_SI));
+	DisableSIPatch = (TRIGame == TRI_NONE && ConfigGetConfig(NIN_CFG_NATIVE_SI));
 
 	bool PatchWide = ConfigGetConfig(NIN_CFG_FORCE_WIDE);
 	if(PatchWide && PatchStaticWidescreen(TITLE_ID, GAME_ID & 0xFF)) //if further patching is needed
diff --git a/loader/source/FPad.c b/loader/source/FPad.c
index cb7e8ad35..15950206a 100644
--- a/loader/source/FPad.c
+++ b/loader/source/FPad.c
@@ -130,15 +130,12 @@ void FPAD_Update( void )
 		PAD_Stick_Y |= Pad[i].stickY;
 		PAD_Stick_X |= Pad[i].stickX;
 	}
-	if(!IsWiiU())
+	PAD_ScanPads();
+	for(i = 0; i < PAD_CHANMAX; ++i)
 	{
-		PAD_ScanPads();
-		for(i = 0; i < PAD_CHANMAX; ++i)
-		{
-			PAD_Pressed |= PAD_ButtonsDown(i) | PAD_ButtonsHeld(i);
-			PAD_Stick_Y |= PAD_StickY(i);
-			PAD_Stick_X |= PAD_StickX(i);
-		}
+		PAD_Pressed |= PAD_ButtonsDown(i) | PAD_ButtonsHeld(i);
+		PAD_Stick_Y |= PAD_StickY(i);
+		PAD_Stick_X |= PAD_StickX(i);
 	}
 	if( WPAD_Pressed == 0 && PAD_Pressed == 0 && WiiDRC_Pressed == 0 && ( PAD_Stick_Y < 25 && PAD_Stick_Y > -25 )  && ( PAD_Stick_X < 25 && PAD_Stick_X > -25 ) )
 	{
diff --git a/loader/source/menu.c b/loader/source/menu.c
index 9fb94634e..f351ebeb1 100644
--- a/loader/source/menu.c
+++ b/loader/source/menu.c
@@ -1012,8 +1012,8 @@ static const char *const *GetSettingsDescription(const MenuCtx *ctx)
 					"will disable Bluetooth and",
 					"USB HID controllers.",
 					"",
-					"This option is not available",
-					"on Wii U.",
+					"On Wii U, test point TP69 can",
+					"be used for one GCN controller.",
 					NULL
 				};
 				return desc_native_si;
@@ -1471,9 +1471,10 @@ static bool UpdateSettingsMenu(MenuCtx *ctx)
 		}
 
 		// Maximum number of emulated controllers.
-		// Not available on Wii U.
+		// Not available on Wii U. (HACK: TP69 is available for 1 GCN controller; also dev vWii debug controller)
+
 		// TODO: Disable on RVL-101?
-		PrintFormat(MENU_SIZE, (!IsWiiU() ? BLACK : DARK_GRAY), MENU_POS_X+50, SettingY(ListLoopIndex),
+		PrintFormat(MENU_SIZE, BLACK, MENU_POS_X+50, SettingY(ListLoopIndex),
 			    "%-18s:%d", OptionStrings[ListLoopIndex], (ncfg->MaxPads));
 		ListLoopIndex++;
 
@@ -1550,7 +1551,7 @@ static bool UpdateSettingsMenu(MenuCtx *ctx)
 
 		// Native controllers. (Required for GBA link; disables Bluetooth and USB HID.)
 		// TODO: Gray out on RVL-101?
-		PrintFormat(MENU_SIZE, (IsWiiU() ? DARK_GRAY : BLACK), MENU_POS_X + 50, SettingY(ListLoopIndex),
+		PrintFormat(MENU_SIZE, BLACK, MENU_POS_X + 50, SettingY(ListLoopIndex),
 			    "%-18s:%-4s", OptionStrings[ListLoopIndex],
 			    (ncfg->Config & (NIN_CFG_NATIVE_SI)) ? "On " : "Off");
 		ListLoopIndex++;
@@ -1632,8 +1633,7 @@ static bool UpdateSettingsMenu(MenuCtx *ctx)
 		// Draw the cursor.
 		u32 cursor_color = BLACK;
 		if (ctx->settings.settingPart == 0) {
-			if ((!IsWiiU() && ctx->settings.posX == NIN_CFG_BIT_USB) ||
-			     (IsWiiU() && ctx->settings.posX == NIN_CFG_NATIVE_SI))
+			if ((!IsWiiU() && ctx->settings.posX == NIN_CFG_BIT_USB))
 			{
 				// Setting is not usable on this platform.
 				// Gray out the cursor, too.
diff --git a/multidol/apploader.c b/multidol/apploader.c
index ed3a3f4d9..f9801e691 100644
--- a/multidol/apploader.c
+++ b/multidol/apploader.c
@@ -115,6 +115,7 @@ u32 Apploader_Run()
 	appldr_entry = apploader_hdr.entry;
 
 	/* Call apploader entry */
+	#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
 	appldr_entry(&appldr_init, &appldr_main, &appldr_final);
 
 	/* Initialize apploader */