diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 65a33648a747e227b4efa446f9fcffd4b9a95cc6..587897030fe5a23f32658a66741f0ea9858107c3 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1044,6 +1044,12 @@
 		<<set $SF.Facility = Object.assign({}, $SF.Facility, {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]})>>
 	<</if>>
 <</if>>
+<<if def $SFUnit>>
+	<<if def $SFUnit.AT>>
+		<<run delete $SFUnit.AT>>
+		<<set $SFUnit.TA = 0>>
+	<</if>>
+<</if>>
 
 <<if ndef $useSlaveSummaryTabs>>
 	<<set $useSlaveSummaryTabs = 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 5dded971f9c727399d09718e9e5e84f49252dee4..f2078f269f76bd51afa0ca82d437176d959f9376 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -6685,7 +6685,8 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look.
 	<</if>>
 	<</replace>>
 <</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take virginity//<</if>>
-<<if ($cumSlaves >= 5)>>
+<<set _cumSlaves = $slaves.filter(function(s) { return s.assignment == "work in the dairy" && s.balls > 0 && isSlaveAvailable(s) && canPenetrate(s); })>>
+<<if _cumSlaves.length >= 5>>
 <br><<link "Replace the machines with cockmilkees from the Dairy">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
@@ -6700,18 +6701,17 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look.
 	<</if>>
 	<<set $activeSlave.devotion += 4>>
 	<<set _totalFuckers = 0>>
-	<<for _RESS = 0; _RESS < $slaves.length; _RESS++>>
-		<<if $slaves[_RESS].assignment == "work in the dairy" && $slaves[_RESS].balls != 0 && canPenetrate($slaves[_RESS])>>
-			<<set $slaves[_RESS].devotion += 4, $slaves[_RESS].penetrativeCount++>>
-			<<set $penetrativeTotal++, _totalFuckers++>>
-			<<if canImpreg($activeSlave, $slaves[_RESS])>>
-				<<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>>
-					<<= knockMeUp($activeSlave, 5, 2, $slaves[_RESS].ID)>>
-				<<elseif canDoVaginal($activeSlave)>>
-					<<= knockMeUp($activeSlave, 5, 0, $slaves[_RESS].ID)>>
-				<<elseif canDoAnal($activeSlave)>>
-					<<= knockMeUp($activeSlave, 5, 1, $slaves[_RESS].ID)>>
-				<</if>>
+	<<for _ress = 0; _ress < _cumSlaves.length; _ress++>>
+		<<set _RESS = $slaveIndices[_cumSlaves[_ress].ID]>>
+		<<set $slaves[_RESS].devotion += 4, $slaves[_RESS].penetrativeCount++>>
+		<<set $penetrativeTotal++, _totalFuckers++>>
+		<<if canImpreg($activeSlave, $slaves[_RESS])>>
+			<<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>>
+				<<= knockMeUp($activeSlave, 5, 2, $slaves[_RESS].ID)>>
+			<<elseif canDoVaginal($activeSlave)>>
+				<<= knockMeUp($activeSlave, 5, 0, $slaves[_RESS].ID)>>
+			<<elseif canDoAnal($activeSlave)>>
+				<<= knockMeUp($activeSlave, 5, 1, $slaves[_RESS].ID)>>
 			<</if>>
 		<</if>>
 	<</for>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index fd287d76a0b66432a50b214993e0e3ec06b90972..75978ee01a4d8d5f6e181032a90a2efb21e968cd 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -86,6 +86,13 @@
 								<</if>>
 							<</if>>
 						<</if>>
+						<<if $slaves[$i].anus > 0 && canDoAnal($slaves[$i])>>
+							<<if $slaves[$i].devotion > 50>>
+								<<if $slaves[$i].amp == 0>>
+									<<set $RERepressedAnalVirginSubIDs.push($slaves[$i].ID)>>
+								<</if>>
+							<</if>>
+						<</if>>
 					<</if>>
 					<<if $slaves[$i].assignmentVisible == 1>>
 						<<if $slaves[$i].livingRules == "luxurious">>
@@ -96,13 +103,6 @@
 							<</if>>
 						<</if>>
 					<</if>>
-					<<if $slaves[$i].anus > 0 && canDoAnal($slaves[$i])>>
-						<<if $slaves[$i].devotion > 50>>
-							<<if $slaves[$i].amp == 0>>
-								<<set $RERepressedAnalVirginSubIDs.push($slaves[$i].ID)>>
-							<</if>>
-						<</if>>
-					<</if>>
 				<</if>>
 			<</if>>
 			<<if $slaves[$i].assignment == "work in the dairy" || $slaves[$i].assignment == "get milked">>