diff --git a/Apple2Mac/Classes/OSX/EmulatorPrefsController.m b/Apple2Mac/Classes/OSX/EmulatorPrefsController.m
index 152bf30b..e03cb13f 100644
--- a/Apple2Mac/Classes/OSX/EmulatorPrefsController.m
+++ b/Apple2Mac/Classes/OSX/EmulatorPrefsController.m
@@ -295,8 +295,8 @@
     if (![self.joystickCalibrationView isHidden])
     {
         [self.joystickCalibrationView setNeedsDisplay:YES];
-        [self.button0Pressed setHidden:!(joy_button0)];
-        [self.button1Pressed setHidden:!(joy_button1)];
+        [self.button0Pressed setHidden:!(run_args.joy_button0)];
+        [self.button1Pressed setHidden:!(run_args.joy_button1)];
     }
 }
 
@@ -324,8 +324,8 @@
         leftAltEngaged = NO;
         rightAltEngaged = NO;
     }
-    [self.button0Pressed setHidden:!(joy_button0)];
-    [self.button1Pressed setHidden:!(joy_button1)];
+    [self.button0Pressed setHidden:!(run_args.joy_button0)];
+    [self.button1Pressed setHidden:!(run_args.joy_button1)];
 }
 
 - (void)_handleKeyEvent:(NSEvent *)event pressed:(BOOL)pressed
diff --git a/Apple2Mac/main.m b/Apple2Mac/main.m
index d9943236..bd7e5df5 100644
--- a/Apple2Mac/main.m
+++ b/Apple2Mac/main.m
@@ -24,7 +24,11 @@ int main(int argc_, char *argv_[])
     int retVal = 1;
     argc = argc_;
     argv = argv_;
-    
+
+#if !TESTING
+    cpu_pause();
+#endif
+
     @autoreleasepool {
 #if TARGET_OS_IPHONE
         retVal = UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));