diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
index 7be273afd8..306e0f0cc6 100644
--- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
@@ -164,7 +164,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2991", "2992", Path.Combine(PathToSHPs, "starporto"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2993", "2995", Path.Combine(PathToSHPs, "lighto"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2996", "2997", Path.Combine(PathToSHPs, "palaceo"), "--building"},
-				new string[] {"--r8", PathToDataR8, PathToPalette, "3370", "3380", Path.Combine(PathToSHPs, "unload"), "--vehicle"},
+				new string[] {"--r8", PathToDataR8, PathToPalette, "3370", "3380", Path.Combine(PathToSHPs, "unload"), "--projectile"},
 				//explosions
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3549", "3564", Path.Combine(PathToSHPs, "wormjaw")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3565", "3585", Path.Combine(PathToSHPs, "wormdust")},
diff --git a/mods/d2k/TODO b/mods/d2k/TODO
index 0efe33cece..57c4a8c634 100644
--- a/mods/d2k/TODO
+++ b/mods/d2k/TODO
@@ -9,7 +9,7 @@
 # welding animation (factories) missing
 # chimney animation (refinery) missing
 # harvest animation missing
-# harvester unload animation ugly
+# harvester turn and offset wrong while unloading
 # add more spice tiles and make them fit
 # add game logic for concrete plates (use terrain overlay from bridges/ressources)
 # allow placing turrets on walls
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 05b8a3b876..3ccc97afdb 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -111,6 +111,8 @@ ORNI.bomber:
 	Plane:
 		ROT: 5
 		Speed: 16
+		RepairBuildings: repaira,repairo,repairh
+		RearmBuildings: starporta,starporto,starporth
 	LimitedAmmo:
 		Ammo: 7
 	RenderUnit:
@@ -138,6 +140,8 @@ CARRYALL.infantry:
 	Plane:
 		ROT: 5
 		Speed: 16
+		RepairBuildings: repaira,repairo,repairh
+		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: carryall
 	WithShadow: