diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx
index 47a7a6c95..f7ae17060 100644
--- a/src/emucore/OSystem.cxx
+++ b/src/emucore/OSystem.cxx
@@ -343,8 +343,8 @@ FBInitStatus OSystem::createFrameBuffer()
     case EventHandlerState::OPTIONSMENU:
     case EventHandlerState::CMDMENU:
     case EventHandlerState::TIMEMACHINE:
-    case EventHandlerState::PLAYBACK:
   #endif
+    case EventHandlerState::PLAYBACK:
       if((fbstatus = myConsole->initializeVideo()) != FBInitStatus::Success)
         return fbstatus;
       break;
diff --git a/src/gui/TimeMachineDialog.cxx b/src/gui/TimeMachineDialog.cxx
index 2ed5295f5..3b591a62d 100644
--- a/src/gui/TimeMachineDialog.cxx
+++ b/src/gui/TimeMachineDialog.cxx
@@ -356,7 +356,7 @@ void TimeMachineDialog::handleKeyDown(StellaKey key, StellaMod mod, bool repeate
       break;
 
     default:
-      Dialog::handleKeyDown(key, mod);
+      Dialog::handleKeyDown(key, mod, repeated);
   }
 }