diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index c9d03bb0aabd8c35f9e0b7ef4289e7bebaf9d4a8..fc19ef8a68b060bad0d034422a36199f5778647d 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -308,14 +308,14 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
 		/* SEX ACT COUNTS AND SEXUAL SATISFACTION */
 
 		let oralUse = (V.oralUseWeight + (slave.lips / 20));
-		let analUse;
+		analUse = 0;
 		if (canDoAnal(slave)) {
 			analUse = V.analUseWeight - slave.anus;
 			if (analUse < 0) {
 				analUse = 0;
 			}
 		}
-		let vaginalUse;
+		vaginalUse = 0;
 		if (canDoVaginal(slave)) {
 			vaginalUse = V.vaginalUseWeight - slave.vagina;
 			if (vaginalUse < 0) {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index ff05dae9c0b492552a7c18e111c8dea1190210cf..c50e6442ca81be1acc7479a2975f07c89775d6e4 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -908,7 +908,7 @@ window.NPCSexSupply = function(LC) {
 	if(LC >= 0.5) {
 		NPCSexSupply.lowerClass += Math.max(Math.trunc(NPCSexSupply.lowerClass * ((LC - 0.5) * (0.2 - V.sexSupplyBarriersLC / 25))), (50 * (1 - V.sexSupplyBarriersLC / 5))); // Max growth of 10% per week, unless it is really low, than a flat 50
 	} else if(LC < 0.5) {
-		if(NPCSexSupply.lowerClass > $lowerClass * (3 - V.sexSupplyBarriersLC / 2)) { // Natural market share of competitors is at least 30%
+		if(NPCSexSupply.lowerClass > V.lowerClass * (3 - V.sexSupplyBarriersLC / 2)) { // Natural market share of competitors is at least 30%
 			NPCSexSupply.lowerClass -= Math.trunc(NPCSexSupply.lowerClass * ((0.5 - LC) / 5)); // Max reduction of 10% per week
 		}
 	}
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index d653d179f4f5559dbb8c3924a2bfbbaebbbc7304..664fa0506ea9d5445cff0023bfe8f037b6d80431 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -418,7 +418,10 @@
 	<</if>>
 <</if>>
 <<if ndef $NPCSexSupply>>
-	<<set $NPCSexSupply = {}>>
+	<<set $NPCSexSupply = {lowerClass: 3000}>>
+<</if>>
+<<if ndef $NPCSexSupply.lowerClass>>
+	<<set $NPCSexSupply.lowerClass = 3000>>
 <</if>>
 <<run PCDatatypeCleanup()>>
 <<run BCReserveInit()>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index cc717d20f0c22ed05967f2f761bd71619af9a28f..a90dccde3e1f4422d9e6cabaf909caa01cb31fea 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -74,9 +74,10 @@ $slaveJobValues = slaveJobValues()>>
 <</if>>
 
 /*Public slut sex supply. Top and upper class won't partake*/
-<<if $slaveJobValues.club * $slaveJobValues.clubSP < _lowerClassSexDemand + _middleClassSexDemand + _visitorsSexDemand>>
-	<<set _clubDemand = _lowerClassSexDemand + _middleClassSexDemand + _visitorsSexDemand,
-	_lowerClassSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_lowerClassSexDemand / _clubDemand)),
+<<set _clubDemand = _lowerClassSexDemand + _middleClassSexDemand + _visitorsSexDemand,
+_lowerClassClubRatio = _lowerClassSexDemand / _clubDemand>>
+<<if $slaveJobValues.club * $slaveJobValues.clubSP < _clubDemand>>
+	<<set _lowerClassSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_lowerClassSexDemand / _clubDemand)),
 	_middleClassSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_middleClassSexDemand / _clubDemand)),
 	_visitorsSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_visitorsSexDemand / _clubDemand))>>
 <<else>>
@@ -113,8 +114,12 @@ $slaveJobValues = slaveJobValues()>>
 
 /*NPC sex supply*/
 <<set $NPCSexSupply = NPCSexSupply(_lowerClassSexDemand/_lowerClassSexDemandRef),
-$NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSupply.lowerClass + $slaveJobValues.arcade + Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_lowerClassSexDemand / _clubDemand)))),
-_lowerClassSexDemand -= $NPCSexSupply.lowerClass>>
+$NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSupply.lowerClass + $slaveJobValues.arcade + Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * _lowerClassClubRatio)))>>
+<<if _lowerClassSexDemand < $NPCSexSupply.lowerClass>>
+	<<set _lowerClassSexDemand = 0>>
+<<else>>
+	<<set _lowerClassSexDemand -= $NPCSexSupply.lowerClass>>
+<</if>>
 <<if ($cheatMode == 1) || ($debugMode == 1)>>
 	<br>NPC Supply Lower Class: $NPCSexSupply.lowerClass
 <</if>>