diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp
index 4d04e0a2ca..8a7a894a63 100644
--- a/pcsx2/gui/SysState.cpp
+++ b/pcsx2/gui/SysState.cpp
@@ -51,14 +51,14 @@ static void SaveStateFile_ReadHeader( IStreamReader& thr )
 	// was removed entirely.
 	if( savever > g_SaveVersion )
 		throw Exception::SaveStateLoadError( thr.GetStreamName() )
-		.SetDiagMsg(wxsFormat( L"Savestate uses an unsupported or unknown savestate version.\n(PCSX2 ver=%d, state ver=%d)", g_SaveVersion, savever ))
+		.SetDiagMsg(wxsFormat( L"Savestate uses an unsupported or unknown savestate version.\n(PCSX2 ver=%x, state ver=%x)", g_SaveVersion, savever ))
 		.SetUserMsg(_("Cannot load this savestate.  The state is from an incompatible edition of PCSX2 that is either newer than this version, or is no longer supported."));
 
 	// check for a "minor" version incompatibility; which happens if the savestate being loaded is a newer version
 	// than the emulator recognizes.  99% chance that trying to load it will just corrupt emulation or crash.
 	if( (savever >> 16) != (g_SaveVersion >> 16) )
 		throw Exception::SaveStateLoadError( thr.GetStreamName() )
-			.SetDiagMsg(wxsFormat( L"Savestate uses an unknown (future?!) savestate version.\n(PCSX2 ver=%d, state ver=%d)", g_SaveVersion, savever ))
+			.SetDiagMsg(wxsFormat( L"Savestate uses an unknown (future?!) savestate version.\n(PCSX2 ver=%x, state ver=%x)", g_SaveVersion, savever ))
 			.SetUserMsg(_("Cannot load this savestate. The state is an unsupported version, likely created by a newer edition of PCSX2."));
 };
 
diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp
index 43c9c57a09..a89514746a 100644
--- a/plugins/GSdx/GS.cpp
+++ b/plugins/GSdx/GS.cpp
@@ -42,6 +42,7 @@ static bool s_vsync = false;
 static bool s_exclusive = true;
 
 static bool s_IsGsOpen2 = false;		// boolean to remove some stuff from the config panel in new PCSX2's/
+static bool isdx11avail = false;		// set on GSinit
 
 EXPORT_C_(uint32) PS2EgetLibType()
 {
@@ -107,6 +108,8 @@ EXPORT_C_(INT32) GSinit()
 		return -1;
 	}
 
+	isdx11avail = GSUtil::IsDirect3D11Available();
+
 #endif
 
 	return 0;
@@ -250,7 +253,6 @@ EXPORT_C_(INT32) GSopen2( void* dsp, INT32 flags )
 	int renderer = theApp.GetConfig("renderer", 0);
 	if( flags & 4 )
 	{
-		static bool isdx11avail = GSUtil::IsDirect3D11Available();
 		if (isdx11avail)	renderer = 4; //dx11 sw
 		else				renderer = 1; //dx9 sw
 	}
@@ -271,7 +273,6 @@ EXPORT_C_(INT32) GSopen(void* dsp, char* title, int mt)
 	if(mt == 2)
 	{
 		// pcsx2 sent a switch renderer request
-		static bool isdx11avail = GSUtil::IsDirect3D11Available();
 		if (isdx11avail)	renderer = 4; //dx11 sw
 		else				renderer = 1; //dx9 sw
 		mt = 1;
diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp
index c6fed52aa4..174942fad8 100644
--- a/plugins/GSdx/GSSettingsDlg.cpp
+++ b/plugins/GSdx/GSSettingsDlg.cpp
@@ -107,7 +107,7 @@ void GSSettingsDlg::OnInit()
 		}
 	}
 
-	bool isdx11avail = GSUtil::IsDirect3D11Available();
+	bool isdx11avail_config = GSUtil::IsDirect3D11Available();
 
 	vector<GSSetting> renderers;
 
@@ -115,7 +115,7 @@ void GSSettingsDlg::OnInit()
 	{
 		if(i >= 3 && i <= 5)
 		{
-			if(!isdx11avail) continue;
+			if(!isdx11avail_config) continue;
 			g_renderers[i].name = std::string("Direct3D") + (GSUtil::HasD3D11Features() ? "11" : "10");
 		}