diff --git a/Source/Core/InputCommon/Src/EventHandler.cpp b/Source/Core/InputCommon/Src/EventHandler.cpp
index 9565e0bce6..d3cdcc38da 100644
--- a/Source/Core/InputCommon/Src/EventHandler.cpp
+++ b/Source/Core/InputCommon/Src/EventHandler.cpp
@@ -20,11 +20,12 @@ EventHandler::~EventHandler() {
 }
 
 EventHandler *EventHandler::GetInstance() {
-    fprintf(stderr, "handler instance %p\n", m_Instance);
+    static EventHandler* m_Instance2 = 0;
+    fprintf(stderr, "handler instance %p\n", m_Instance2);
 
-    if (! m_Instance)
-	m_Instance = new EventHandler();
-    return m_Instance;
+    if (! m_Instance2)
+	m_Instance2 = new EventHandler();
+    return m_Instance2;
 }
 
 void EventHandler::Destroy() {
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/SConscript b/Source/Plugins/Plugin_nJoy_Testing/Src/SConscript
index 1cfc4b426e..00c940c08e 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/SConscript
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/SConscript
@@ -13,10 +13,10 @@ files = [
 	'nJoy.cpp',
 	]
 	
-if not env['HAVE_WX']
-	files.Append('GUI/AboutBox.cpp',
-		'GUI/ConfigBox.cpp',
-		)
+if env['HAVE_WX']:
+	files +=[ 'GUI/AboutBox.cpp',
+		  'GUI/ConfigBox.cpp',
+		]
 
 padenv = env.Clone()
 padenv.Append(