diff --git a/Tools/Replay/LogReader.cpp b/Tools/Replay/LogReader.cpp
index b5ac05ac25..aec2f88b1b 100644
--- a/Tools/Replay/LogReader.cpp
+++ b/Tools/Replay/LogReader.cpp
@@ -183,6 +183,10 @@ void LogReader::initialise_fmt_map()
                 continue;
             }
             ::fprintf(stderr, "Failed to find apparently-generated-name (%s) in COMMON_LOG_STRUCTURES\n", *name);
+            if (strncmp(*name, "NK", 2)==0 || strncmp(*name, "XK", 2) == 0) {
+                // cope with older logs
+                continue;
+            }
             abort();
         }
     }
diff --git a/Tools/Replay/Replay.h b/Tools/Replay/Replay.h
index 26a44aa7e7..43da347ffc 100644
--- a/Tools/Replay/Replay.h
+++ b/Tools/Replay/Replay.h
@@ -51,6 +51,8 @@
 
 class ReplayVehicle : public AP_Vehicle {
 public:
+    friend class Replay;
+
     ReplayVehicle() { unused = -1; }
     // HAL::Callbacks implementation.
     void setup() override;
@@ -59,15 +61,6 @@ public:
 
     virtual bool set_mode(const uint8_t new_mode, const ModeReason reason) override { return true; }
 
-    AP_InertialSensor ins;
-    AP_Baro barometer;
-    AP_GPS gps;
-    Compass compass;
-    AP_SerialManager serial_manager;
-    RangeFinder rng;
-    NavEKF2 EKF2{&ahrs};
-    NavEKF3 EKF3{&ahrs};
-    AP_AHRS_NavEKF ahrs{EKF2, EKF3};
     AP_Vehicle::FixedWing aparm;
     AP_Airspeed airspeed;
     AP_Int32 unused; // logging is magic for Replay; this is unused