diff --git a/gen/aircraft.py b/gen/aircraft.py
index a5eaeb4b..93befe97 100644
--- a/gen/aircraft.py
+++ b/gen/aircraft.py
@@ -751,9 +751,14 @@ class AircraftConflictGenerator:
                             start_type=flight.start_type,
                             at=helipad.static_unit,
                         )
-                        # Note : A bit dirty, need better support required in pydcs
+
+                        # Note : A bit dirty, need better support in pydcs
                         group.points[0].action = PointAction.FromGroundArea
                         group.points[0].type = "TakeOffGround"
+                        if flight.start_type != "Cold":
+                            group.points[0].action = PointAction.FromGroundAreaHot
+                            group.points[0].type = "TakeOffGroundHot"
+
                         helipad.occupied = True
 
                     for i in range(flight.count - 1):
diff --git a/gen/groundobjectsgen.py b/gen/groundobjectsgen.py
index 86c41ea0..9d307e9c 100644
--- a/gen/groundobjectsgen.py
+++ b/gen/groundobjectsgen.py
@@ -24,7 +24,7 @@ from dcs.task import (
     FireAtPoint,
 )
 from dcs.triggers import TriggerStart, TriggerZone
-from dcs.unit import Ship, Unit, Vehicle, SingleHeliPad
+from dcs.unit import Ship, Unit, Vehicle, InvisibleFARP
 from dcs.unitgroup import Group, ShipGroup, StaticGroup, VehicleGroup
 from dcs.unittype import StaticType, UnitType
 from dcs.vehicles import vehicle_map
@@ -590,7 +590,7 @@ class HelipadGenerator:
         for i, helipad in enumerate(self.cp.helipads):
             name = self.cp.name + "_helipad_" + str(i)
             logging.info("Generating helipad : " + name)
-            pad = SingleHeliPad(name=name)
+            pad = InvisibleFARP(name=name)
             pad.position = Point(helipad.x, helipad.y)
             pad.heading = helipad.heading
             sg = unitgroup.StaticGroup(self.m.next_group_id(), name)