diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
index 302589d440..bcfce2401d 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
@@ -50,11 +50,11 @@ namespace WiiMoteEmu
 bool LocalSearchDevices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads)
 {
 	//DEBUG_LOG(PAD, "LocalSearchDevices");
-	bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads);
+	bool bSuccess = InputCommon::SearchDevices(_joyinfo, _NumPads);
 	
 	DoLocalSearchDevices(_joyinfo, _NumPads);
 	
-	return Success;
+	return bSuccess;
 }
 
 bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads)
@@ -64,13 +64,13 @@ bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo
 	// Turn off device polling while resetting
 	EnablePolling(false);
 	
-	bool Success = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);
+	bool bSuccess = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);
 	
 	EnablePolling(true);
 	
 	DoLocalSearchDevices(_joyinfo, _NumPads);
 	
-	return Success;
+	return bSuccess;
 }
 
 // Fill joyinfo with the current connected devices
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
index 357c583ea9..538181d0f7 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
@@ -807,7 +807,7 @@ void PADConfigDialognJoy::CreateGUIControls()
 		#ifdef _WIN32
 		m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(476, 21), 0, NULL, wxCB_READONLY);
 		#else
-		m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, arrayStringFor_Joyname[0], wxDefaultPosition, wxSize(450, 25), arrayStringFor_Joyname, 0, wxDefaultValidator, wxT("m_Joyname"));
+		m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(450, 25), 0, NULL, wxCB_READONLY);
 		#endif
 
 		m_gJoyname[i] = new wxStaticBoxSizer (wxHORIZONTAL, m_Controller[i], wxT("Controller"));