diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp
index 8fdc1aff8e..9af2e8d1c3 100644
--- a/src/openrct2/Game.cpp
+++ b/src/openrct2/Game.cpp
@@ -496,7 +496,7 @@ int32_t game_do_command_p(
                 else if (replayManager->IsNormalising() && commandExecutes && (flags & GAME_COMMAND_FLAG_REPLAY) != 0)
                     recordCommand = true;
 
-                if (recordCommand)
+                if (recordCommand && gGameCommandNestLevel == 1)
                 {
                     int32_t callback = game_command_callback_get_index(game_command_callback);
 
diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp
index f26921ce3d..fc824bb342 100644
--- a/src/openrct2/ReplayManager.cpp
+++ b/src/openrct2/ReplayManager.cpp
@@ -744,7 +744,7 @@ namespace OpenRCT2
                 }
 
                 // Focus camera on event.
-                if (isPositionValid && gCommandPosition.x != 0x8000)
+                if (isPositionValid && static_cast<uint16_t>(gCommandPosition.x) != 0x8000)
                 {
                     auto* mainWindow = window_get_main();
                     if (mainWindow != nullptr)