diff --git a/game/ato/flightplans/airassault.py b/game/ato/flightplans/airassault.py
index 257cde9e..46a983df 100644
--- a/game/ato/flightplans/airassault.py
+++ b/game/ato/flightplans/airassault.py
@@ -92,7 +92,7 @@ class AirAssaultFlightPlan(FormationAttackFlightPlan, UiZoneDisplay):
 
     def ui_zone(self) -> UiZone:
         return UiZone(
-            [self.layout.target.position],
+            [self.layout.targets[0].position],
             self.ctld_target_zone_radius,
         )
 
diff --git a/game/ato/flightplans/escort.py b/game/ato/flightplans/escort.py
index 999fa805..4523cef2 100644
--- a/game/ato/flightplans/escort.py
+++ b/game/ato/flightplans/escort.py
@@ -45,6 +45,7 @@ class Builder(FormationAttackBuilder[EscortFlightPlan, FormationAttackLayout]):
         )
         ingress.only_for_player = True
         target.only_for_player = True
+        hold = None
         if not self.primary_flight_is_air_assault:
             hold = builder.hold(self._hold_point())
         elif self.package.primary_flight is not None:
diff --git a/game/missiongenerator/aircraft/waypoints/joinpoint.py b/game/missiongenerator/aircraft/waypoints/joinpoint.py
index fde06286..fa7b04e1 100644
--- a/game/missiongenerator/aircraft/waypoints/joinpoint.py
+++ b/game/missiongenerator/aircraft/waypoints/joinpoint.py
@@ -35,7 +35,7 @@ class JoinPointBuilder(PydcsWaypointBuilder):
                 targets = [
                     Targets.All.Air.Helicopters.id,
                     Targets.All.GroundUnits.AirDefence.id,
-                    Targets.All.GroundUnits.GroundVehicles.UnarmedVehicles.id,
+                    Targets.All.GroundUnits.Infantry.id,
                     Targets.All.GroundUnits.GroundVehicles.ArmoredVehicles.id,
                     Targets.All.Naval.Ships.ArmedShips.LightArmedShips.id,
                 ]
@@ -84,7 +84,7 @@ class JoinPointBuilder(PydcsWaypointBuilder):
         max_dist: float = 30.0,
         vertical_spacing: float = 2000.0,
     ) -> None:
-        waypoint.tasks.append(OptROE(value=OptROE.Values.OpenFireWeaponFree))
+        waypoint.tasks.append(OptROE(value=OptROE.Values.OpenFire))
 
         rx = (random.random() + 0.1) * 333
         ry = feet(vertical_spacing).meters
diff --git a/game/missiongenerator/aircraft/waypoints/pydcswaypointbuilder.py b/game/missiongenerator/aircraft/waypoints/pydcswaypointbuilder.py
index 72769da4..e0f2bb7e 100644
--- a/game/missiongenerator/aircraft/waypoints/pydcswaypointbuilder.py
+++ b/game/missiongenerator/aircraft/waypoints/pydcswaypointbuilder.py
@@ -79,7 +79,8 @@ class PydcsWaypointBuilder:
         if (
             self.flight.client_count > 0
             and self.flight.unit_type.dcs_unit_type == AJS37
-        ) and (self.waypoint.waypoint_type not in TARGET_WAYPOINTS):
+            and self.waypoint.waypoint_type not in TARGET_WAYPOINTS
+        ):
             return True
         else:
             return False
diff --git a/game/missiongenerator/aircraft/waypoints/splitpoint.py b/game/missiongenerator/aircraft/waypoints/splitpoint.py
index 74cc5dd0..2bcb9bd1 100644
--- a/game/missiongenerator/aircraft/waypoints/splitpoint.py
+++ b/game/missiongenerator/aircraft/waypoints/splitpoint.py
@@ -19,9 +19,10 @@ class SplitPointBuilder(PydcsWaypointBuilder):
             waypoint.tasks.append(OptFormation.rotary_wedge())
         else:
             waypoint.tasks.append(OptFormation.finger_four_close())
-        waypoint.speed_locked = True
-        waypoint.speed = self.flight.coalition.doctrine.rtb_speed.meters_per_second
-        waypoint.ETA_locked = False
+        if not self.flight.is_helo:
+            waypoint.speed_locked = True
+            waypoint.speed = self.flight.coalition.doctrine.rtb_speed.meters_per_second
+            waypoint.ETA_locked = False
         if self.flight is self.package.primary_flight:
             script = RunScript(
                 f'trigger.action.setUserFlag("split-{id(self.package)}", true)'