diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 7de834ba4d..ed901689b2 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -476,7 +476,7 @@ void CConfigMain::CreateGUIControls()
 	WiiScreenSaver->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.SSV"));
 	WiiProgressiveScan = new wxCheckBox(WiiPage, ID_WII_IPL_PGS, wxT("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	WiiProgressiveScan->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.PGS"));
-	WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, wxT("Use EuRGB60 Mode (PAL6)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, wxT("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	WiiEuRGB60->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60"));
 	arrayStringFor_WiiAspectRatio.Add(wxT("4:3")); arrayStringFor_WiiAspectRatio.Add(wxT("16:9"));
 	WiiAspectRatioText = new wxStaticText(WiiPage, ID_WII_IPL_AR_TEXT, wxT("Aspect Ratio:"), wxDefaultPosition, wxDefaultSize);
diff --git a/Source/Core/InputCommon/Src/Configuration.cpp b/Source/Core/InputCommon/Src/Configuration.cpp
index 5394877a64..0dc3e0b1d4 100644
--- a/Source/Core/InputCommon/Src/Configuration.cpp
+++ b/Source/Core/InputCommon/Src/Configuration.cpp
@@ -234,17 +234,10 @@ void Square2Circle(int &_x, int &_y, int _pad, std::string SDiagonal, bool Circl
 #ifdef _WIN32
 std::string VKToString(int keycode)
 {
-#ifdef _WIN32
 	// Default value
 	char KeyStr[64] = {0};
 	std::string KeyString;
 
-	// TODO: Switch to unicode GetKeyNameText?
-	if (keycode < 256)	// Keyboard
-		GetKeyNameTextA(MapVirtualKey(keycode, MAPVK_VK_TO_VSC) << 16, KeyStr, 64);
-	else	// Pad
-		sprintf(KeyStr, "PAD: %d", keycode - 0x1000);
-
 	switch(keycode)
 	{
 		// Give it some help with a few keys
@@ -270,17 +263,26 @@ std::string VKToString(int keycode)
 		case VK_NUMLOCK: return "Num Lock";
 		case VK_MULTIPLY: return "Num *";
 		case VK_ADD: return "Num +";
-		case VK_SEPARATOR: return "Num Separator";
+		case VK_SEPARATOR: case 0xC2: return "Num Separator";
 		case VK_SUBTRACT: return "Num -";
 		case VK_DECIMAL: return "Num Decimal";
 		case VK_DIVIDE: return "Num /";
 
-		default: return KeyString = KeyStr;
+		case VK_OEM_PLUS: return "=";
+		case VK_OEM_MINUS: return "-";
+		case VK_OEM_COMMA: return ",";
+		case VK_OEM_PERIOD: return ".";
+
+		//default: return KeyString = KeyStr;
 	}
-#else
-	// An equivalent name translation can probably be used on other systems to?
-	return "";
-#endif
+	
+	// TODO: Switch to unicode GetKeyNameText?
+	if (keycode < 256)	// Keyboard
+		GetKeyNameTextA(MapVirtualKey(keycode, MAPVK_VK_TO_VSC) << 16, KeyStr, 64);
+	else	// Pad
+		sprintf(KeyStr, "PAD: %d", keycode - 0x1000);
+	
+	return KeyString = KeyStr;
 }
 #endif
 
diff --git a/Source/Core/InputCommon/Src/DirectInputBase.cpp b/Source/Core/InputCommon/Src/DirectInputBase.cpp
index 560aeaaa99..b9a7fee33d 100644
--- a/Source/Core/InputCommon/Src/DirectInputBase.cpp
+++ b/Source/Core/InputCommon/Src/DirectInputBase.cpp
@@ -131,8 +131,12 @@ void DInput::DIKToString(unsigned int keycode, char *keyStr)
 			strcpy(keyStr, "Num Decimal");
 			break;
 		case DIK_NUMPADCOMMA:
+		case DIK_ABNT_C2:
 			strcpy(keyStr, "Num Separator");
 			break;
+		case DIK_NUMPADEQUALS:
+			strcpy(keyStr, "Num =");
+			break;
 		default:
 			// TODO: Switch to unicode GetKeyNameText?
 			GetKeyNameTextA(keycode << 16, keyStr, 64);
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
index ed45db2834..a15e1cc82a 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
@@ -120,6 +120,8 @@ void InitPP(int adapter, int f, int aa_mode, D3DPRESENT_PARAMETERS *pp)
 		yres = pp->BackBufferHeight = FSResY;	
 		pp->SwapEffect = D3DSWAPEFFECT_DISCARD;
 		pp->Windowed = FALSE;
+		//if(g_Config.bHideCursor)
+			ShowCursor(false);
 	}
 	else
 	{
@@ -130,6 +132,7 @@ void InitPP(int adapter, int f, int aa_mode, D3DPRESENT_PARAMETERS *pp)
 		pp->SwapEffect = D3DSWAPEFFECT_DISCARD;
 		pp->PresentationInterval = g_Config.bVSync ? D3DPRESENT_INTERVAL_DEFAULT : D3DPRESENT_INTERVAL_IMMEDIATE;
 		pp->Windowed = TRUE;
+		ShowCursor(true);
 	}
 }