diff --git a/src/app/App.tsx b/src/app/App.tsx
index c896de8e..384c847a 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -14176,8 +14176,7 @@ export function App({ store, initialStatusMessage }: AppProps) {
                   isActive={activePanelId === panelId}
                   world={editorState.document.world}
                   sceneDocument={editorState.document}
-                  editorSimulationScene={editorSimulationScene}
-                  editorSimulationClock={editorSimulationClock}
+                  editorSimulationController={editorSimulationController}
                   projectAssets={editorState.document.assets}
                   loadedModelAssets={loadedModelAssets}
                   loadedImageAssets={loadedImageAssets}
@@ -14709,13 +14708,13 @@ export function App({ store, initialStatusMessage }: AppProps) {
                     )}
                   </div>
                   <div className="material-summary">
-                    {editorSimulationClockOverride === null
+                    {!editorSimulationOverrideActive
                       ? "The editor viewport follows the authored project start day and time."
                       : editorSimulationPlaying
                         ? "The editor viewport is running on an overridden clock."
                         : "The editor viewport is paused on an overridden clock."}
                   </div>
-                  {editorSimulationClockOverride === null ? null : (
+                  {!editorSimulationOverrideActive ? null : (
                     <div className="material-summary">
                       Authored start: Day{" "}
                       {editorState.projectDocument.time.startDayNumber} ·{" "}
diff --git a/src/document/migrate-scene-document.ts b/src/document/migrate-scene-document.ts
index 46403c8d..478d3637 100644
--- a/src/document/migrate-scene-document.ts
+++ b/src/document/migrate-scene-document.ts
@@ -193,6 +193,7 @@ import {
   PLAYER_START_INTERACTION_REACH_SCENE_DOCUMENT_VERSION,
   PLAYER_START_INTERACTION_ANGLE_SCENE_DOCUMENT_VERSION,
   PLAYER_START_GAMEPAD_CAMERA_LOOK_SCENE_DOCUMENT_VERSION,
+  PLAYER_START_INTERACT_BINDINGS_SCENE_DOCUMENT_VERSION,
   PLAYER_START_INPUT_BINDINGS_SCENE_DOCUMENT_VERSION,
   PLAYER_START_NAVIGATION_MODE_SCENE_DOCUMENT_VERSION,
   PLAYER_START_PAUSE_BINDINGS_SCENE_DOCUMENT_VERSION,
@@ -5465,6 +5466,7 @@ export function migrateSceneDocument(source: unknown): SceneDocument {
     source.version !== PLAYER_START_AIR_CONTROL_SCENE_DOCUMENT_VERSION &&
     source.version !== PLAYER_START_INTERACTION_REACH_SCENE_DOCUMENT_VERSION &&
     source.version !== PLAYER_START_INTERACTION_ANGLE_SCENE_DOCUMENT_VERSION &&
+    source.version !== PLAYER_START_INTERACT_BINDINGS_SCENE_DOCUMENT_VERSION &&
     source.version !== PLAYER_START_MOVEMENT_TEMPLATE_SCENE_DOCUMENT_VERSION &&
     source.version !== PROJECT_NAME_SCENE_DOCUMENT_VERSION &&
     source.version !== STATIC_SIMPLE_MODEL_COLLIDERS_SCENE_DOCUMENT_VERSION &&