diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml
index b7f21bec88..6c9ded5379 100644
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -210,7 +210,7 @@ TRAN:
 	Armor:
 		Type: Light
 	RevealsShroud:
-		Range: 12c0
+		Range: 10c0
 		Type: CenterPosition
 	Aircraft:
 		RearmBuildings: hpad
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 3d5c27613d..75d03035a8 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -268,6 +268,8 @@
 	WithInfantryBody:
 		IdleSequences: idle1,idle2
 		StandSequences: stand,stand2
+	DetectCloaked:
+		CloakTypes: Hijacker
 
 ^CivInfantry:
 	Inherits: ^Infantry
diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
index 027931bb68..f8c243bf11 100644
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -39,7 +39,7 @@ DOG:
 		StandSequences: stand
 	IgnoresDisguise:
 	DetectCloaked:
-		Range: 5c0
+		CloakTypes: Cloak, Hijacker
 	Voiced:
 		VoiceSet: DogVoice
 	-TakeCover:
@@ -222,7 +222,7 @@ SPY:
 		UpgradeMinEnabledLevel: 1
 	IgnoresDisguise:
 	DetectCloaked:
-		Range: 5c0
+		CloakTypes: Cloak, Hijacker
 	Armament:
 		Weapon: SilencedPPK
 	AttackFrontal:
@@ -450,6 +450,14 @@ HIJACKER:
 	WithInfantryBody:
 		-IdleSequences:
 		StandSequences: stand
+	Crushable:
+		WarnProbability: 95
+	Cloak:
+		InitialDelay: 250
+		CloakDelay: 120
+		UncloakOnMove: true
+		CloakTypes: Cloak, Hijacker
+		IsPlayerPalette: true
 
 SHOK:
 	Inherits: ^Soldier
@@ -527,6 +535,7 @@ SNIPER:
 		UncloakOnMove: true
 		IsPlayerPalette: true
 	DetectCloaked:
+		CloakTypes: Cloak, Hijacker
 		Range: 6c0
 	-MustBeDestroyed:
 	ProducibleWithLevel:
diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml
index 3b64643216..e172652d5a 100644
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -126,10 +126,6 @@ CAMERA:
 	RevealsShroud:
 		Range: 10c0
 		Type: CenterPosition
-	ProximityCaptor:
-		Types: Camera
-	DetectCloaked:
-		Range: 10c0
 	BodyOrientation:
 		QuantizedFacings: 1
 	WithSpriteBody:
@@ -137,27 +133,20 @@ CAMERA:
 		Image: camera
 
 camera.paradrop:
-	AlwaysVisible:
-	Immobile:
-		OccupiesSpace: false
-	Health:
-		HP: 1000
+	Inherits: CAMERA
 	RevealsShroud:
 		Range: 6c0
-		Type: CenterPosition
-	ProximityCaptor:
-		Types: Camera
 
-SONAR:
-	AlwaysVisible:
-	Immobile:
-		OccupiesSpace: false
-	Health:
-		HP: 1000
-	ProximityCaptor:
-		Types: Sonar
+camera.spyplane:
+	Inherits: CAMERA
 	DetectCloaked:
 		Range: 10c0
+		CloakTypes: Cloak, Hijacker
+
+SONAR:
+	Inherits: camera.spyplane
+	-RevealsShroud:
+	DetectCloaked:
 		CloakTypes: Underwater
 
 FLARE:
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index 351a003974..71c26dc61e 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -1121,7 +1121,7 @@ AFLD:
 		LongDesc: Reveals an area of the map\nand cloaked enemy units.
 		SelectTargetSound: slcttgt1.aud
 		EndChargeSound: spypln1.aud
-		CameraActor: camera
+		CameraActor: camera.spyplane
 		CameraRemoveDelay: 150
 		UnitType: u2
 		QuantizedFacings: 8
diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml
index 439b17217e..1d4318b606 100644
--- a/mods/ra/weapons/smallcaliber.yaml
+++ b/mods/ra/weapons/smallcaliber.yaml
@@ -297,7 +297,7 @@ SilencedPPK:
 
 FLAK-23:
 	ReloadDelay: 10
-	Range: 8c0
+	Range: 6c0
 	Report: AACANON3.AUD
 	ValidTargets: Air, Ground, Water
 	Projectile: Bullet