diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index e042d11bd8..6a11e8baa6 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -38,17 +38,16 @@ files = ["Console.cpp",
          "HW/EXI_DeviceAD16.cpp",
          "HW/EXI_DeviceMemoryCard.cpp",
          "HW/EXI_DeviceMic.cpp",
-		 "HW/EXI_DeviceEthernet.cpp",
+         "HW/EXI_DeviceEthernet.cpp",
          "HW/GPFifo.cpp",
          "HW/HW.cpp",
          "HW/Memmap.cpp",
          "HW/MemoryInterface.cpp",
          "HW/PeripheralInterface.cpp",
          "HW/PixelEngine.cpp",
-         "HW/SerialInterface.cpp",
          "HW/SI.cpp",
          "HW/SI_Device.cpp",
-         "HW/SI_DeviceGBA.cpp",
+#         "HW/SI_DeviceGBA.cpp",
          "HW/SI_DeviceGCController.cpp",
          "HW/StreamADPCM.cpp",
          "HW/SystemTimers.cpp",
diff --git a/Source/Core/InputCommon/Src/InputCommon.h b/Source/Core/InputCommon/Src/InputCommon.h
index 1981c10386..aaf0934510 100644
--- a/Source/Core/InputCommon/Src/InputCommon.h
+++ b/Source/Core/InputCommon/Src/InputCommon.h
@@ -4,6 +4,6 @@ extern EventHandler *eventHandler;
 
 namespace InputCommon
 {
-	void Init(); 
-	void Shutdown();
+    void Init(); 
+    void Shutdown();
 }
diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
index 3cfa693bca..dc2c7184a2 100644
--- a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
@@ -94,7 +94,12 @@ bool registerKey(int nPad, int id, sf::Key::Code code, int mods) {
     key.keyCode = code;
     key.mods = mods;
     
-    if (!eventHandler->EventHandler::RegisterEventListener(ParseKeyEvent, key)) {
+    if (!eventHandler) {
+	PanicAlert("Can't get event handler");
+	return false;
+    }
+
+    if (!eventHandler->RegisterEventListener(ParseKeyEvent, key)) {
 	char codestr[100];
 	EventHandler::SFKeyToString(code, codestr);
 	PanicAlert("Failed to register %s, might be already in use", codestr);
@@ -109,7 +114,7 @@ bool registerKey(int nPad, int id, sf::Key::Code code, int mods) {
 	oldKey.mods = mods;
 
 	// Might be not be registered yet
-	eventHandler->EventHandler::RemoveEventListener(oldKey); 
+	eventHandler->RemoveEventListener(oldKey); 
     }
 
     pad[nPad].keyForControl[id] = code;