diff --git a/mods/cnc-classic/rules/aircraft.yaml b/mods/cnc-classic/rules/aircraft.yaml
index ebfcae6544..261e3b6407 100644
--- a/mods/cnc-classic/rules/aircraft.yaml
+++ b/mods/cnc-classic/rules/aircraft.yaml
@@ -27,10 +27,10 @@ TRAN:
 		Range: 8
 	RenderUnit:
 	WithRotor@PRIMARY:
-		Offset: 0,14,0,-4
+		Offset: -597,0,171
 	WithRotor@SECONDARY:
 		Id: rotor_2
-		Offset: 0,-14,0,-2
+		Offset: 597,0,85
 	WithShadow:
 	Cargo:
 		Types: Infantry
@@ -74,7 +74,7 @@ HELI:
 		ReloadTicks: 10
 	RenderUnit:
 	WithRotor:
-		Offset: 0,0,0,-2
+		Offset: 0,0,85
 	WithMuzzleFlash:
 	WithShadow:
 	FallsToEarth:
diff --git a/mods/ra-classic/rules/aircraft.yaml b/mods/ra-classic/rules/aircraft.yaml
index ad2745911e..01371c8941 100644
--- a/mods/ra-classic/rules/aircraft.yaml
+++ b/mods/ra-classic/rules/aircraft.yaml
@@ -22,10 +22,10 @@ BADR:
 		Moves: yes
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged@0:
-		Offset: 11, -11
+		Offset: -469,469,0
 		Interval: 2
 	SmokeTrailWhenDamaged@1:
-		Offset: -11, -11
+		Offset: -469,-469,0
 		Interval: 2
 	-EjectOnDeath:
 	-GpsDot:
@@ -56,10 +56,10 @@ BADR.bomber:
 		Moves: yes
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged@0:
-		Offset: 11, -11
+		Offset: -469,469,0
 		Interval: 2
 	SmokeTrailWhenDamaged@1:
-		Offset: -11, -11
+		Offset: -469,-469,0
 		Interval: 2
 	-EjectOnDeath:
 	-GpsDot:
@@ -107,7 +107,7 @@ MIG:
 		Moves: yes
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged:
-		Offset: 0,-20,0,-4
+		Offset: -853,0,171
 		Interval: 2
 
 YAK:
@@ -156,10 +156,9 @@ YAK:
 		Moves: yes
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged:
-		Offset: 0, -20
+		Offset: -853,0,0
 		Interval: 2
 
-
 TRAN:
 	Inherits: ^Helicopter
 	Buildable:
@@ -240,7 +239,7 @@ HELI:
 	FallsToEarth:
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged:
-		Offset: 0,-10
+		Offset: -427,0,0
 
 HIND:
 	Inherits: ^Helicopter
@@ -289,7 +288,7 @@ HIND:
 	FallsToEarth:
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged:
-		Offset: 0,-10
+		Offset: -427,0,0
 
 U2:
 	Inherits: ^Plane
@@ -309,5 +308,5 @@ U2:
 		Moves: yes
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged:
-		Offset: 0,-25
+		Offset: -1c43,0,0
 		Interval: 2
diff --git a/mods/ra-classic/rules/vehicles.yaml b/mods/ra-classic/rules/vehicles.yaml
index b38b99b302..230f4e17e3 100644
--- a/mods/ra-classic/rules/vehicles.yaml
+++ b/mods/ra-classic/rules/vehicles.yaml
@@ -449,7 +449,8 @@ TTNK:
 		Weapon: TTankZap
 		LocalOffset: 0,0,213
 	AttackFrontal:
-	RenderUnitSpinner:
+	RenderUnit:
+	WithSpinner:
 	Selectable:
 		Bounds: 28,28,0,0
 	AutoTarget: