diff --git a/source/ngc/dvd.cpp b/source/ngc/dvd.cpp
index 145a604..5c9c054 100644
--- a/source/ngc/dvd.cpp
+++ b/source/ngc/dvd.cpp
@@ -19,9 +19,7 @@
 #include <malloc.h>
 
 #ifdef HW_RVL
-extern "C" {
 #include <di/di.h>
-}
 #endif
 
 #include "fceugx.h"
diff --git a/source/ngc/fceugx.cpp b/source/ngc/fceugx.cpp
index 0fe0870..481dfe0 100644
--- a/source/ngc/fceugx.cpp
+++ b/source/ngc/fceugx.cpp
@@ -37,9 +37,7 @@
 #include "gui/gui.h"
 
 #ifdef HW_RVL
-extern "C" {
 #include <di/di.h>
-}
 #endif
 
 #include "FreeTypeGX.h"
diff --git a/source/ngc/pad.cpp b/source/ngc/pad.cpp
index 8f65c87..3a2c0d3 100644
--- a/source/ngc/pad.cpp
+++ b/source/ngc/pad.cpp
@@ -582,8 +582,8 @@ void GetJoy()
 			userInput[i].pad.btns_h & PAD_BUTTON_B &&
 			userInput[i].pad.btns_h & PAD_TRIGGER_Z
 			 ) ||
-			(userInput[i].wpad.btns_d & WPAD_BUTTON_HOME) ||
-			(userInput[i].wpad.btns_d & WPAD_CLASSIC_BUTTON_HOME)
+			(userInput[i].wpad.btns_h & WPAD_BUTTON_HOME) ||
+			(userInput[i].wpad.btns_h & WPAD_CLASSIC_BUTTON_HOME)
 		)
 		{
 			ConfigRequested = 1; // go to the menu