diff --git a/Interceptor/Input.cs b/Interceptor/Input.cs
index 141b9ba..0fd9973 100644
--- a/Interceptor/Input.cs
+++ b/Interceptor/Input.cs
@@ -99,8 +99,8 @@ public void Unload()
 
         private void DriverCallback()
         {
-            InterceptionDriver.SetFilter(context, InterceptionDriver.IsKeyboard, (Int32) KeyboardFilterMode);
-            InterceptionDriver.SetFilter(context, InterceptionDriver.IsMouse, (Int32) MouseFilterMode);
+            InterceptionDriver.SetFilter(context, InterceptionDriver.IsKeyboard, (ushort) KeyboardFilterMode);
+            InterceptionDriver.SetFilter(context, InterceptionDriver.IsMouse, (ushort) MouseFilterMode);
 
             Stroke stroke = new Stroke();
 
@@ -128,7 +128,7 @@ private void DriverCallback()
                 {
                     if (OnKeyPressed != null)
                     {
-                        var args = new KeyPressedEventArgs() { Key = stroke.Key.Code, State = stroke.Key.State};
+                        var args = new KeyPressedEventArgs() { Key = stroke.Key.Code, State = stroke.Key.State };
                         OnKeyPressed(this, args);
 
                         if (args.Handled)
diff --git a/Interceptor/InterceptionDriver.cs b/Interceptor/InterceptionDriver.cs
index e5c0257..057f19c 100644
--- a/Interceptor/InterceptionDriver.cs
+++ b/Interceptor/InterceptionDriver.cs
@@ -95,7 +95,7 @@ public struct MouseStroke
         public Int16 Rolling;
         public Int32 X;
         public Int32 Y;
-        public UInt16 Information;
+        public UInt32 Information;
     }  
 
     [StructLayout(LayoutKind.Sequential)]
@@ -132,10 +132,10 @@ public static class InterceptionDriver
         public static extern void SetPrecedence(IntPtr context, Int32 device, Int32 Precedence);
 
         [DllImport("interception.dll", EntryPoint = "interception_get_filter", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetFilter(IntPtr context, Int32 device);
+        public static extern ushort GetFilter(IntPtr context, Int32 device);
 
         [DllImport("interception.dll", EntryPoint = "interception_set_filter", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetFilter(IntPtr context, Predicate predicate, Int32 keyboardFilterMode);
+        public static extern void SetFilter(IntPtr context, Predicate predicate, ushort keyboardFilterMode);
 
         [DllImport("interception.dll", EntryPoint = "interception_wait", CallingConvention = CallingConvention.Cdecl)]
         public static extern Int32 Wait(IntPtr context);
@@ -156,9 +156,19 @@ public static class InterceptionDriver
         public static extern Int32 IsInvalid(Int32 device);
 
         [DllImport("interception.dll", EntryPoint = "interception_is_keyboard", CallingConvention = CallingConvention.Cdecl)]
-        public static extern Int32 IsKeyboard(Int32 device);
+        private static extern Int32 _IsKeyboard(Int32 device);
+
+        public static Int32 IsKeyboard(Int32 device)
+        {
+            return _IsKeyboard(device);
+        }
 
         [DllImport("interception.dll", EntryPoint = "interception_is_mouse", CallingConvention = CallingConvention.Cdecl)]
-        public static extern Int32 IsMouse(Int32 device);
+        private static extern Int32 _IsMouse(Int32 device);
+
+        public static Int32 IsMouse(Int32 device)
+        {
+            return _IsMouse(device);
+        }
     }
 }
diff --git a/Interceptor/Interceptor.csproj b/Interceptor/Interceptor.csproj
index 801c838..ceed7ab 100644
--- a/Interceptor/Interceptor.csproj
+++ b/Interceptor/Interceptor.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>