diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 34783c4764..7aae2bec10 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -21,6 +21,14 @@ carryall.reinforce:
 		LandAltitude: 100
 		LandWhenIdle: False
 		AirborneUpgrades: airborne
+	Targetable@GROUND:
+		TargetTypes: Ground, Vehicle
+		UpgradeTypes: airborne
+		UpgradeMaxEnabledLevel: 0
+	Targetable@AIRBORNE:
+		TargetTypes: Air
+		UpgradeTypes: airborne
+		UpgradeMinEnabledLevel: 1
 	SpawnActorOnDeath:
 		Actor: carryall.husk
 	Carryall:
@@ -49,7 +57,6 @@ frigate:
 		RepairBuildings: repair_pad
 		RearmBuildings:
 		Repulsable: False
-		AirborneUpgrades: airborne
 	Health:
 		HP: 500
 	-AppearsOnRadar:
@@ -65,6 +72,8 @@ frigate:
 
 ornithopter:
 	Inherits: ^Plane
+	Targetable:
+		TargetTypes: Air
 	AttackBomber:
 	Armament:
 		Weapon: OrniBomb
@@ -78,7 +87,6 @@ ornithopter:
 		RepairBuildings: repair_pad
 		RearmBuildings:
 		Repulsable: False
-		AirborneUpgrades: airborne
 	AmmoPool:
 		Ammo: 5
 	Tooltip:
@@ -96,7 +104,6 @@ ornithopter.husk:
 		Speed: 350
 		RepairBuildings:
 		RearmBuildings:
-		AirborneUpgrades: airborne
 	RenderSprites:
 		Image: ornithopter
 
@@ -109,7 +116,6 @@ carryall.husk:
 		Speed: 210
 		RepairBuildings:
 		RearmBuildings:
-		AirborneUpgrades: airborne
 	RenderSprites:
 		Image: carryall
 
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index 5b198f8c17..243866cdc0 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -218,8 +218,6 @@
 	Guardable:
 	DeathSounds:
 		DeathTypes: ExplosionDeath, SoundDeath, SmallExplosionDeath, BulletDeath
-	Parachutable:
-		FallRate: 130
 	MustBeDestroyed:
 	TerrainModifiesDamage:
 		TerrainModifier:
diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml
index 9ed2bb5c68..bd0481364e 100644
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -133,7 +133,6 @@ waypoint:
 	Inherits: carryall
 	Helicopter:
 		InitialFacing: 104
-		AirborneUpgrades: airborne
 	RenderSprites:
 		Image: carryall
 		Palette: colorpicker