diff --git a/SConstruct b/SConstruct
index 28fafa39f1..e935ac81e8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -68,7 +68,7 @@ dirs = [
     'Source/Plugins/Plugin_DSP_LLE/Src',
     'Source/Plugins/Plugin_PadSimple/Src',
     'Source/Plugins/Plugin_PadSimpleEvnt/Src',
-    'Source/Plugins/Plugin_nJoy_SDL/Src',
+#    'Source/Plugins/Plugin_nJoy_SDL/Src',
     'Source/Plugins/Plugin_nJoy_Testing/Src',
     'Source/Plugins/Plugin_Wiimote/Src',
     'Source/Core/DolphinWX/Src',
diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp
index 97726fa5d4..ddf895b175 100644
--- a/Source/Core/Core/Src/HW/Memmap.cpp
+++ b/Source/Core/Core/Src/HW/Memmap.cpp
@@ -784,6 +784,7 @@ u8 *GetPointer(const u32 _Address)
     case 0x11:
     case 0x12:
     case 0x13:
+	case 0x7B:
     case 0x90:
     case 0x91:
     case 0x92:
@@ -809,8 +810,9 @@ u8 *GetPointer(const u32 _Address)
 	case 0xCD:
 		_dbg_assert_msg_(MEMMAP, 0, "Memory", "GetPointer from IO Bridge doesnt work");
 		return NULL;
+	case 0xFF: break;
 	default:
-		if (!PanicYesNo("Tried to get pointer for unknown address %08x\n Continue?", _Address))
+		if (!PanicYesNo("unknown pointer address report this to the devs %08x\n Continue?", (_Address >> 24)))
 			Crash();
 		break;
 	}
diff --git a/Source/Core/InputCommon/Src/SDL.h b/Source/Core/InputCommon/Src/SDL.h
index 3fb9d8b06d..e54895d7cd 100644
--- a/Source/Core/InputCommon/Src/SDL.h
+++ b/Source/Core/InputCommon/Src/SDL.h
@@ -38,7 +38,11 @@
 #include <vector>
 #include <cmath>
 
+#ifdef _WIN32 // UGLY HACK FIXME PLEAAAAAAASE
 #include <SDL.h> // Externals
+#else
+#include <SDL/SDL.h> // Externals
+#endif
 
 #include "Common.h" // Common
 #include "ConsoleWindow.h" 
@@ -202,4 +206,4 @@ std::vector<int> Pad_Square_to_Circle(int _x, int _y, int _pad, CONTROLLER_MAPPI
 } // InputCommon
 
 
-#endif // _SDL_h
\ No newline at end of file
+#endif // _SDL_h