diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader
index 60cba81b0..e30f8a134 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy
index 8b374a524..927e05cb1 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy
@@ -1397,8 +1397,6 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
     else {
         libABFE498B_gv_aP_Triggers_skipCutscenes = true;
         lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace);
-        libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p01_USER);
-        lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p01_USER);
         if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
             UnitSetPropertyFixed(UnitFromId(237324189), c_unitPropEnergyPercent, 100.0);
             autoE89A680B_g = UnitGroup("AP_Lair", gv_p01_USER, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
@@ -1434,6 +1432,8 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
             }
 
         }
+        libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p01_USER);
+        lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p01_USER);
     }
     return true;
 }
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml
index fb4310543..1fa0c5ed4 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml
+++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml
@@ -192,6 +192,8 @@
 <Unit id="Food1000"/>
 <Unit id="InfestableBiodome" Variations="1,2,3,4"/>
 <Unit id="InfestedColonistShip" Variations="2,3"/>
+<Unit id="AP_Zergling"/>
+<Unit id="AP_InfestedAbomination"/>
 <Unit id="AP_VikingAssault"/>
 <Unit id="AP_VikingFighter"/>
 <Unit id="AP_SupplyDepot"/>
@@ -201,8 +203,6 @@
 <Unit id="AP_Factory"/>
 <Unit id="AP_SCV"/>
 <Unit id="AP_CommandCenter"/>
-<Unit id="AP_InfestedAbomination"/>
-<Unit id="AP_Zergling"/>
 <Unit id="AP_CreepTumorBurrowed"/>
 <Unit id="AP_Starport"/>
 <Unit id="AP_Viper"/>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers
index 7cdd239bc..a82893e84 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers
@@ -1780,9 +1780,9 @@
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="FunctionCall" Id="84A62B4E"/>
         <FunctionCall Type="FunctionCall" Id="4D04870E"/>
+        <FunctionCall Type="FunctionCall" Id="6B71613C"/>
         <FunctionCall Type="FunctionCall" Id="CC1F2175"/>
         <FunctionCall Type="FunctionCall" Id="75AC58BC"/>
-        <FunctionCall Type="FunctionCall" Id="6B71613C"/>
         <FunctionCall Type="FunctionCall" Id="518A017B"/>
         <FunctionCall Type="FunctionCall" Id="8272CB15"/>
     </Element>
@@ -1816,32 +1816,6 @@
         <ParameterDef Type="ParamDef" Library="15EF4C78" Id="64EC5B75"/>
         <Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
     </Element>
-    <Element Type="FunctionCall" Id="CC1F2175">
-        <FunctionDef Type="FunctionDef" Library="Lbty" Id="05E197DE"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
-        <Parameter Type="Param" Id="83B66D8C"/>
-        <Parameter Type="Param" Id="36B2D379"/>
-    </Element>
-    <Element Type="Param" Id="83B66D8C">
-        <ParameterDef Type="ParamDef" Library="Lbty" Id="97BDB33A"/>
-        <FunctionCall Type="FunctionCall" Id="C10A1CA3"/>
-    </Element>
-    <Element Type="FunctionCall" Id="C10A1CA3">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="36B2D379">
-        <ParameterDef Type="ParamDef" Library="Lbty" Id="3F42FBCD"/>
-        <Variable Type="Variable" Id="2A54A03E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="75AC58BC">
-        <FunctionDef Type="FunctionDef" Library="15EF4C78" Id="84565F53"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
-        <Parameter Type="Param" Id="C7FCA900"/>
-    </Element>
-    <Element Type="Param" Id="C7FCA900">
-        <ParameterDef Type="ParamDef" Library="15EF4C78" Id="CF70F2A6"/>
-        <Variable Type="Variable" Id="2A54A03E"/>
-    </Element>
     <Element Type="FunctionCall" Id="6B71613C">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
@@ -2220,6 +2194,32 @@
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Race"/>
     </Element>
+    <Element Type="FunctionCall" Id="CC1F2175">
+        <FunctionDef Type="FunctionDef" Library="Lbty" Id="05E197DE"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
+        <Parameter Type="Param" Id="83B66D8C"/>
+        <Parameter Type="Param" Id="36B2D379"/>
+    </Element>
+    <Element Type="Param" Id="83B66D8C">
+        <ParameterDef Type="ParamDef" Library="Lbty" Id="97BDB33A"/>
+        <FunctionCall Type="FunctionCall" Id="C10A1CA3"/>
+    </Element>
+    <Element Type="FunctionCall" Id="C10A1CA3">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
+    </Element>
+    <Element Type="Param" Id="36B2D379">
+        <ParameterDef Type="ParamDef" Library="Lbty" Id="3F42FBCD"/>
+        <Variable Type="Variable" Id="2A54A03E"/>
+    </Element>
+    <Element Type="FunctionCall" Id="75AC58BC">
+        <FunctionDef Type="FunctionDef" Library="15EF4C78" Id="84565F53"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
+        <Parameter Type="Param" Id="C7FCA900"/>
+    </Element>
+    <Element Type="Param" Id="C7FCA900">
+        <ParameterDef Type="ParamDef" Library="15EF4C78" Id="CF70F2A6"/>
+        <Variable Type="Variable" Id="2A54A03E"/>
+    </Element>
     <Element Type="FunctionCall" Id="518A017B">
         <FunctionDef Type="FunctionDef" Library="15EF4C78" Id="3E0709E3"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version
index 3341ca3f2..38bf8206d 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 48ba4633c..80e90ba85 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -3752,6 +3752,7 @@
         <FinalEffect value="AP_ZerglingRespawnControllerRebirth"/>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_ZerglingRespawnDeath">
+        <BehaviorCategories index="Permanent" value="1"/>
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
         <Requirements value="AP_ZerglingRespawnEnabled"/>
@@ -5655,6 +5656,7 @@
         <ExpireEffect value="AP_ZealotPurifierReviveApplyBehavior"/>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_ZealotRespawnDeath">
+        <BehaviorCategories index="Permanent" value="1"/>
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
         <DamageResponse Fatal="1" Handled="AP_ZealotRespawnDeathSet">
@@ -7039,6 +7041,7 @@
         </DamageResponse>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_AberrationBanelingIncubation">
+        <BehaviorCategories index="Permanent" value="1"/>
         <InfoFlags index="Hidden" value="1"/>
         <Modification>
             <DeathResponse Chance="1" Effect="AP_AberrationBanelingIncubationCU"/>
@@ -7058,6 +7061,7 @@
         </Modification>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_CorruptorScourgeIncubation">
+        <BehaviorCategories index="Permanent" value="1"/>
         <InfoFlags index="Hidden" value="1"/>
         <Modification>
             <DeathResponse Chance="1" Effect="AP_CorruptorScourgeIncubationSwitch">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
index b318e36be..575b304df 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
@@ -2975,6 +2975,7 @@ void lib15EF4C78_gf_RemoveUnusedStartingUnits (unitgroup lp_startingUnits, strin
         }
 
         if ((CatalogFieldValueGet(c_gameCatalogUnit, UnitGetType(autoA0E4A284_var), "Race", c_playerAny) != CatalogFieldValueGet(c_gameCatalogRace, lp_desiredFaction, "AttributeId", c_playerAny))) {
+            UnitBehaviorRemoveCategory(autoA0E4A284_var, c_unitBehaviorFlagPermanent);
             UnitRemove(autoA0E4A284_var);
         }
 
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader
index da0d247d3..16f720da2 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader and b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/GameData.version b/Mods/ArchipelagoPlayer.SC2Mod/GameData.version
index 1e49556ed..b754b81f2 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/GameData.version and b/Mods/ArchipelagoPlayer.SC2Mod/GameData.version differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
index ff65413c5..38feb9798 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Triggers
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
@@ -61141,10 +61141,35 @@
         <Element Type="FunctionCall" Id="202CF0CD">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
             <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
+            <FunctionCall Type="Comment" Library="15EF4C78" Id="712683C2"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="9623A6B9"/>
             <FunctionCall Type="Comment" Library="15EF4C78" Id="347B357F"/>
             <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="D5E7B1D9"/>
             <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="65403F3A"/>
         </Element>
+        <Element Type="Comment" Id="712683C2">
+            <Comment>
+                &quot;Permanent&quot; behaviors can include on-death effects which might inadvertently trigger on unit removal
+            </Comment>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+        </Element>
+        <Element Type="FunctionCall" Id="9623A6B9">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="47D6D6BB"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="6F074D4B"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="D67C0625"/>
+        </Element>
+        <Element Type="Param" Id="6F074D4B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="1638EDC1"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="0114487A"/>
+        </Element>
+        <Element Type="FunctionCall" Id="0114487A">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+        </Element>
+        <Element Type="Param" Id="D67C0625">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7F636C64"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="C708B9C5"/>
+        </Element>
         <Element Type="Comment" Id="347B357F">
             <Comment>
                 If unit race != desired faction
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version b/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version
index d387fb968..95f1a37b6 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version and b/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version differ