diff --git a/game/ato/flightmembers.py b/game/ato/flightmembers.py
index 103e82ae..df70aa34 100644
--- a/game/ato/flightmembers.py
+++ b/game/ato/flightmembers.py
@@ -28,7 +28,7 @@ class FlightMembers(IFlightRoster):
     def from_roster(flight: Flight, roster: FlightRoster) -> FlightMembers:
         members = FlightMembers(flight)
         loadout = Loadout.default_for(flight)
-        if flight.squadron.aircraft.name == "F-15I Ra'am":
+        if flight.squadron.aircraft.variant_id == "F-15I Ra'am":
             loadout.pylons[16] = Weapon.with_clsid("{IDF_MODS_PROJECT_F-15I_Raam_Dome}")
         members.members = [FlightMember(p, loadout) for p in roster.pilots]
         return members
@@ -64,7 +64,7 @@ class FlightMembers(IFlightRoster):
             loadout = self.members[0].loadout.clone()
         else:
             loadout = Loadout.default_for(self.flight)
-        if self.flight.squadron.aircraft.name == "F-15I Ra'am":
+        if self.flight.squadron.aircraft.variant_id == "F-15I Ra'am":
             loadout.pylons[16] = Weapon.with_clsid("{IDF_MODS_PROJECT_F-15I_Raam_Dome}")
         for _ in range(new_size - self.max_size):
             member = FlightMember(self.flight.squadron.claim_available_pilot(), loadout)
diff --git a/game/ato/packagewaypoints.py b/game/ato/packagewaypoints.py
index 118931eb..09460173 100644
--- a/game/ato/packagewaypoints.py
+++ b/game/ato/packagewaypoints.py
@@ -10,7 +10,7 @@ from game.ato.flightplans.waypointbuilder import WaypointBuilder
 from game.flightplan import JoinZoneGeometry
 from game.flightplan.ipsolver import IpSolver
 from game.flightplan.refuelzonegeometry import RefuelZoneGeometry
-from game.persistence.paths import liberation_user_dir
+from game.persistency import debug_dir
 from game.utils import dcs_to_shapely_point
 from game.utils import nautical_miles
 
@@ -33,7 +33,7 @@ class PackageWaypoints:
     ) -> PackageWaypoints:
         origin = package.departure_closest_to_target()
 
-        waypoint_debug_directory = liberation_user_dir() / "Debug/Waypoints"
+        waypoint_debug_directory = debug_dir() / "Waypoints"
 
         # Start by picking the best IP for the attack.
         ip_solver = IpSolver(
diff --git a/game/dcs/aircrafttype.py b/game/dcs/aircrafttype.py
index 622d5ef6..c6dcc748 100644
--- a/game/dcs/aircrafttype.py
+++ b/game/dcs/aircrafttype.py
@@ -39,7 +39,6 @@ from game.radio.channels import (
     ViperChannelNamer,
     WarthogChannelNamer,
 )
-from game.savecompat import has_save_compat_for
 from game.utils import (
     Distance,
     ImperialUnits,
@@ -353,7 +352,6 @@ class AircraftType(UnitType[Type[FlyingType]]):
     def task_priority(self, task: FlightType) -> int:
         return self.task_priorities[task]
 
-    @has_save_compat_for(9)
     def __setstate__(self, state: dict[str, Any]) -> None:
         # Save compat: the `name` field has been renamed `variant_id`.
         if "name" in state:
diff --git a/game/dcs/groundunittype.py b/game/dcs/groundunittype.py
index ba32dff3..502e0a0a 100644
--- a/game/dcs/groundunittype.py
+++ b/game/dcs/groundunittype.py
@@ -12,7 +12,6 @@ from dcs.vehicles import vehicle_map
 
 from game.data.units import UnitClass
 from game.dcs.unittype import UnitType
-from game.savecompat import has_save_compat_for
 
 
 @dataclass
@@ -66,7 +65,6 @@ class GroundUnitType(UnitType[Type[VehicleType]]):
         dict[type[VehicleType], list[GroundUnitType]]
     ] = defaultdict(list)
 
-    @has_save_compat_for(9)
     def __setstate__(self, state: dict[str, Any]) -> None:
         # Save compat: the `name` field has been renamed `variant_id`.
         if "name" in state:
diff --git a/game/dcs/shipunittype.py b/game/dcs/shipunittype.py
index 4c739e9c..59dddca6 100644
--- a/game/dcs/shipunittype.py
+++ b/game/dcs/shipunittype.py
@@ -12,7 +12,6 @@ from dcs.unittype import ShipType
 
 from game.data.units import UnitClass
 from game.dcs.unittype import UnitType
-from game.savecompat import has_save_compat_for
 
 
 @dataclass(frozen=True)
@@ -22,7 +21,6 @@ class ShipUnitType(UnitType[Type[ShipType]]):
         list
     )
 
-    @has_save_compat_for(9)
     def __setstate__(self, state: dict[str, Any]) -> None:
         # Save compat: the `name` field has been renamed `variant_id`.
         if "name" in state:
diff --git a/game/persistency.py b/game/persistency.py
index 46cb35d4..934cb2b4 100644
--- a/game/persistency.py
+++ b/game/persistency.py
@@ -76,6 +76,10 @@ def base_path() -> Path:
     return Path(_dcs_saved_game_folder)
 
 
+def debug_dir() -> Path:
+    return base_path() / "Retribution" / "Debug"
+
+
 def settings_dir() -> Path:
     return base_path() / "Retribution" / "Settings"
 
diff --git a/qt_ui/windows/SquadronDialog.py b/qt_ui/windows/SquadronDialog.py
index c221fadc..0fcbd193 100644
--- a/qt_ui/windows/SquadronDialog.py
+++ b/qt_ui/windows/SquadronDialog.py
@@ -204,7 +204,7 @@ class SquadronDestinationComboBox(QComboBox):
             if overflow:
                 overflow_msg = ""
                 for s in overflow:
-                    overflow_msg += f"{s.name} - {s.aircraft.name}<br/>"
+                    overflow_msg += f"{s.name} - {s.aircraft.variant_id}<br/>"
                 QMessageBox.warning(
                     None,
                     "Insufficient parking space detected!",