diff --git a/mods/cnc-classic/rules/aircraft.yaml b/mods/cnc-classic/rules/aircraft.yaml
index d58059b059..41607ab3f1 100644
--- a/mods/cnc-classic/rules/aircraft.yaml
+++ b/mods/cnc-classic/rules/aircraft.yaml
@@ -56,6 +56,7 @@ HELI:
 	Helicopter:
 		ROT: 4
 		Speed: 20
+		RearmBuildings: hpad.nod
 	Health:
 		HP: 125
 	Armor:
@@ -70,9 +71,7 @@ HELI:
 	LimitedAmmo:
 		Ammo: 10
 		PipCount: 5
-	Reloads:
-		Count: 10
-		Period: 200
+		ReloadTicks: 10
 	RenderUnit:
 	WithRotor:
 		Offset: 0,0,0,-2
@@ -99,6 +98,7 @@ ORCA:
 	Helicopter:
 		ROT: 4
 		Speed: 20
+		RearmBuildings: hpad.gdi
 	Health:
 		HP: 100
 	Armor:
@@ -113,9 +113,7 @@ ORCA:
 	LimitedAmmo:
 		Ammo: 10
 		PipCount: 5
-	Reloads:
-		Count: 2
-		Period: 100
+		ReloadTicks: 10
 	RenderUnit:
 	WithShadow:
 	FallsToEarth:
diff --git a/mods/cnc-classic/rules/defaults.yaml b/mods/cnc-classic/rules/defaults.yaml
index ac8725bd40..1302ead0fb 100644
--- a/mods/cnc-classic/rules/defaults.yaml
+++ b/mods/cnc-classic/rules/defaults.yaml
@@ -74,8 +74,8 @@
 	Selectable:
 		Voice: VehicleVoice
 	Helicopter:
-		RepairBuildings: hpad
-		RearmBuildings:
+		RepairBuildings: fix
+		RearmBuildings: hpad
 		LandWhenIdle: false
 	Buildable:
 		Queue: Aircraft
diff --git a/mods/cnc-classic/rules/structures.yaml b/mods/cnc-classic/rules/structures.yaml
index d9f61ceafd..976e6c6b0b 100644
--- a/mods/cnc-classic/rules/structures.yaml
+++ b/mods/cnc-classic/rules/structures.yaml
@@ -304,7 +304,7 @@ WEAP:
 		Produces: Vehicle
 	ProductionBar:
 
-HPADGDI:
+HPAD.GDI:
 	Inherits: ^Building
 	Valued:
 		Cost: 1500
@@ -316,6 +316,8 @@ HPADGDI:
 		Description: Produces and reloads helicopters
 	ProvidesCustomPrerequisite:
 		Prerequisite: hpad
+	RenderBuilding:
+		Image: hpad
 	Buildable:
 		BuildPaletteOrder: 60
 		Prerequisites: barracks
@@ -333,6 +335,7 @@ HPADGDI:
 	FreeActor:
 		Actor: ORCA
 		Facing: 3
+		SpawnOffset: 1,2
 	Exit@1:
 #		SpawnOffset: 0,0
 		SpawnOffset: 0,-6
@@ -345,7 +348,7 @@ HPADGDI:
 	ProductionBar:
 	Bib:
 
-HPADNOD:
+HPAD.NOD:
 	Inherits: ^Building
 	Valued:
 		Cost: 1500
@@ -357,6 +360,8 @@ HPADNOD:
 		Description: Produces and reloads helicopters
 	ProvidesCustomPrerequisite:
 		Prerequisite: hpad
+	RenderBuilding:
+		Image: hpad
 	Buildable:
 		BuildPaletteOrder: 60
 		Prerequisites: barracks
@@ -373,6 +378,7 @@ HPADNOD:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from what we want for now, to properly emulate
 	FreeActor:
 		Actor: HELI
+		SpawnOffset: 1,1
 	Exit@1:
 		SpawnOffset: 0,0
 #		SpawnOffset: 0,-6