diff --git a/MacPass/MPAutotypeCommand.m b/MacPass/MPAutotypeCommand.m
index 1767d7db..0c663c29 100644
--- a/MacPass/MPAutotypeCommand.m
+++ b/MacPass/MPAutotypeCommand.m
@@ -323,11 +323,10 @@
    Set the modifiers to the ones we want
    We use our private event source so no modifier reset should be needed
    */
-  CGEventSetFlags(pressKey,flags);
+  CGEventSetFlags(pressKey, flags);
   CGEventSetFlags(releaseKey, flags);
   
   /* Send the event */
-  NSLog(@"Seding %@", self);
   CGEventPost(kCGHIDEventTap, pressKey);
   usleep(0.05 * NSEC_PER_MSEC);
   CGEventPost(kCGHIDEventTap, releaseKey);
diff --git a/MacPass/MPAutotypeKeyPress.m b/MacPass/MPAutotypeKeyPress.m
index bf0419bd..cf8f5c1e 100644
--- a/MacPass/MPAutotypeKeyPress.m
+++ b/MacPass/MPAutotypeKeyPress.m
@@ -39,12 +39,14 @@
   if(![self isValid]) {
     return; // no valid command. Stop.
   }
-  CGKeyCode mappedKey = [self _transformKeyCode];
-  [self sendPressKey:mappedKey modifierFlags:self.modifierMask];
+  //CGKeyCode mappedKey = [self _transformKeyCode];
+  [self sendPressKey:self.keyCode modifierFlags:self.modifierMask];
 }
 
 - (BOOL)isValid {
-  return ([self _transformKeyCode] != kMPUnknownKeyCode);
+  return YES;
+  /* TODO test for actual validity of the command */
+  //return ([self _transformKeyCode] != kMPUnknownKeyCode);
 }
 
 - (CGKeyCode)_transformKeyCode {
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 92ebf48e..84ba7744 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -62,7 +62,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2550</string>
+	<string>2555</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>