diff --git a/src/OpenTK/Minimal.cs b/src/OpenTK/Minimal.cs
index 11b62b76..56ddd440 100644
--- a/src/OpenTK/Minimal.cs
+++ b/src/OpenTK/Minimal.cs
@@ -13,6 +13,8 @@ namespace OpenTK
     // minimal targets (e.g. MonoTouch).
     // Note: the "overriden" classes must not be fully qualified for this to work!
 
+    #if MINIMAL
+
     // System.Diagnostics.Debug
     static class Debug
     {
@@ -39,8 +41,6 @@ namespace OpenTK
         public static void Flush() { }
     }
 
-    #if MINIMAL
-
     // System.Diagnostics.Stopwatch
     sealed class Stopwatch
     {
diff --git a/src/OpenTK/Platform/Windows/WinRawJoystick.cs b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
index 82f13c60..ccc82425 100644
--- a/src/OpenTK/Platform/Windows/WinRawJoystick.cs
+++ b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
@@ -83,8 +83,13 @@ namespace OpenTK.Platform.Windows
             {
                 if (page == HIDPage.GenericDesktop || page == HIDPage.Simulation) // set axis only when HIDPage is known by HidHelper.TranslateJoystickAxis() to avoid axis0 to be overwritten by unknown HIDPage
                 {
-                    JoystickAxis axis = GetAxis(collection, page, usage);
-                    State.SetAxis(axis, value);
+					//Certain joysticks (Speedlink Black Widow, PS3 pad connected via USB)
+					//return an invalid HID page of 1, so 
+                    if ((int)usage != 1)
+                    {
+                        JoystickAxis axis = GetAxis(collection, page, usage);
+                        State.SetAxis(axis, value);
+                    }
                 }
             }