diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml
index 9e01b8f8..629fb406 100644
--- a/.github/workflows/Deploy.yml
+++ b/.github/workflows/Deploy.yml
@@ -4,7 +4,7 @@ name: Deploy
 
 on:
   release:
-    types: [published]
+    types: [edited]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
diff --git a/AUTHORS b/AUTHORS
index 78dddf29..6bef4113 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,7 +37,7 @@ Contributors & special thanks to:
 
 	* Mortecha (Huey)
 	* Katzsmile (UAV)
-	* KylieAdams (YF-23)
+	* KylieAdams (YF-23, Black Hawk)
 	* 206UE (F-22)
 	* CombinE (0tnk Beam Cannon)
 	* TeleVisor (Orca v2, Orca Bomber, Orca Warship, Banshee, Harpy)
@@ -84,7 +84,7 @@ Contributors & special thanks to:
 	* Conman (Bi Xi Dragon)
 	* Medalmonkey/DerekPlus (Obelisktrooper, Mirage Trooper/Saboteur, Mercenary, Stormtrooper, Shock Trooper, Railgunner/Parasite)
 	* m7 (Microwave Tank)
-	* Merophage/RAPD (conscript)
+	* Merophage/RAPD (conscript, light infantry)
 	* unknown_men (Crazy Ivan)
 
 Of course YMCA wouldn't exist today without OpenRA & the
diff --git a/mods/ca/maps/delirium-shell/shellmap.lua b/mods/ca/maps/delirium-shell/shellmap.lua
index 3115d03e..a6e2eea3 100644
--- a/mods/ca/maps/delirium-shell/shellmap.lua
+++ b/mods/ca/maps/delirium-shell/shellmap.lua
@@ -1,4 +1,4 @@
-light_infantry--[[
+--[[
    Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
    This file is part of OpenRA, which is free software. It is made
    available to you under the terms of the GNU General Public License
diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml
index 8a17039a..ddb38ddb 100644
--- a/mods/ca/rules/aircraft.yaml
+++ b/mods/ca/rules/aircraft.yaml
@@ -926,7 +926,7 @@ NHAW:
 		Weapon: DropDummy
 		Cursor: ability
 		OutsideRangeCursor: ability
-		RequiresCondition: cargo && stance-holdfire
+		RequiresCondition: stance-holdfire
 	ParachuteCargoOnCondition:
 		RequiresCondition: dropcargo
 		ReturnToBase: false
@@ -2635,7 +2635,6 @@ Dropship:
 		Weapon: DropDummy
 		Cursor: ability
 		OutsideRangeCursor: ability
-		RequiresCondition: cargo
 	ParaDrop:
 		ChuteSound: chute1.aud
 	ParachuteCargoOnCondition:
diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
index b67bfe78..825a2345 100644
--- a/mods/ca/rules/defaults.yaml
+++ b/mods/ca/rules/defaults.yaml
@@ -2462,7 +2462,7 @@ PROC.Dummy:
 		CloakDelay: 90
 		UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage, Heal
 	Repairable:
-		RepairActors: fix, rep, srep, afld, afld.gdi, afld.allies
+		RepairActors: fix, rep, srep, afld, afld.gdi, afld.allies, chairport
 	Aircraft:
 		CruisingCondition: cruising
 		PauseOnCondition: empdisable && !airborne || being-warped
diff --git a/mods/ca/sequences/aircraft.yaml b/mods/ca/sequences/aircraft.yaml
index 407f2163..1e2b44cd 100644
--- a/mods/ca/sequences/aircraft.yaml
+++ b/mods/ca/sequences/aircraft.yaml
@@ -264,6 +264,7 @@ u2:
 
 nhaw:
 	Inherits: ^VehicleOverlays
+	Inherits: ^LowRes
 	idle: bhwk
 		Facings: 32
 		UseClassicFacings: True
@@ -431,6 +432,7 @@ scrn.payload:
 
 yf23:
 	Inherits: ^VehicleOverlays
+	Inherits: ^LowRes
 	idle: yf-23
 		Facings: 32
 		UseClassicFacings: True