diff --git a/plugins/GSdx/GSTextureFX10.cpp b/plugins/GSdx/GSTextureFX10.cpp
index dd223a508e..48cf096cf7 100644
--- a/plugins/GSdx/GSTextureFX10.cpp
+++ b/plugins/GSdx/GSTextureFX10.cpp
@@ -263,7 +263,8 @@ void GSTextureFX10::UpdatePS(PSSelector sel, const PSConstantBuffer* cb, PSSampl
 
 	m_dev->PSSetShader((*i).second, m_ps_cb);
 
-	ID3D10SamplerState* ss0=NULL, *ss1=NULL;
+	ID3D10SamplerState* ss0 = NULL;
+	ID3D10SamplerState* ss1 = NULL;
 
 	if(sel.tfx != 4)
 	{
diff --git a/plugins/GSdx/GSWnd.cpp b/plugins/GSdx/GSWnd.cpp
index aa9226c5f5..3f148dbc6b 100644
--- a/plugins/GSdx/GSWnd.cpp
+++ b/plugins/GSdx/GSWnd.cpp
@@ -105,9 +105,12 @@ bool GSWnd::Create(const string& title)
 	wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
 	wc.lpszClassName = "GSWnd";
 
-	if(!RegisterClass(&wc))
+	if(!GetClassInfo(wc.hInstance, wc.lpszClassName, &wc))
 	{
-		return false;
+		if(!RegisterClass(&wc))
+		{
+			return false;
+		}
 	}
 
 	DWORD style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW | WS_BORDER;