diff --git a/Source/OpenTK/Platform/X11/API.cs b/Source/OpenTK/Platform/X11/API.cs
index e4fefbfe..b577825e 100644
--- a/Source/OpenTK/Platform/X11/API.cs
+++ b/Source/OpenTK/Platform/X11/API.cs
@@ -27,7 +27,7 @@ namespace OpenTK.Platform.X11
     using Mask = System.IntPtr;
     using Atom = System.IntPtr;
     using VisualID = System.IntPtr;
-    using Time = System.UInt32;
+    using Time = System.IntPtr;
     using KeyCode = System.Byte;    // Or maybe ushort?
 
     using Display = System.IntPtr;
diff --git a/Source/OpenTK/Platform/X11/X11KeyMap.cs b/Source/OpenTK/Platform/X11/X11KeyMap.cs
index 945ea7e6..192fcd15 100644
--- a/Source/OpenTK/Platform/X11/X11KeyMap.cs
+++ b/Source/OpenTK/Platform/X11/X11KeyMap.cs
@@ -126,7 +126,7 @@ namespace OpenTK.Platform.X11
                 this.Add(XKey.KP_Up, Key.Keypad8);
                 this.Add(XKey.KP_Page_Up, Key.Keypad9);
                 this.Add(XKey.KP_Delete, Key.KeypadDecimal);
-                this.Add(XKey.KP_Enter, Key.Enter);
+                this.Add(XKey.KP_Enter, Key.KeypadEnter);
 
             }
             catch (ArgumentException e)
diff --git a/Source/OpenTK/Platform/X11/X11XrandrDisplayDevice.cs b/Source/OpenTK/Platform/X11/X11XrandrDisplayDevice.cs
index 09e2de21..f34b33da 100644
--- a/Source/OpenTK/Platform/X11/X11XrandrDisplayDevice.cs
+++ b/Source/OpenTK/Platform/X11/X11XrandrDisplayDevice.cs
@@ -29,7 +29,7 @@ namespace OpenTK.Platform.X11
         // Store a mapping between DisplayDevices and X11 screens.
         static Dictionary<DisplayDevice, int> deviceToScreen = new Dictionary<DisplayDevice, int>();
         // Keep the time when the config of each screen was last updated.
-        static List<uint> lastConfigUpdate = new List<uint>();
+        static List<IntPtr> lastConfigUpdate = new List<IntPtr>();
         
         #region --- Constructors ---
 
@@ -40,7 +40,7 @@ namespace OpenTK.Platform.X11
             // TODO: Global X11 lock.
             for (int screen = 0; screen < API.ScreenCount; screen++)
             {
-                uint timestamp_of_last_update;
+                IntPtr timestamp_of_last_update;
                 Functions.XRRTimes(API.DefaultDisplay, screen, out timestamp_of_last_update);
                 lastConfigUpdate.Add(timestamp_of_last_update);