diff --git a/compasses.asm b/compasses.asm
index f75a790..845b4eb 100644
--- a/compasses.asm
+++ b/compasses.asm
@@ -11,9 +11,10 @@ DrawDungeonCompassCounts:
 		BNE + : RTL : + ; skip if we don't have compass
 	++
 
-	LDA $040C : LSR : TAX
-
-	LDA.l CompassTotal, X : AND #$00FF
+	LDA $040C : LSR
+	BNE +
+		INC
+	+ TAX : LDA.l CompassTotal, X : AND #$00FF
 	SEP #$20
 	JSR HudHexToDec2Digit
 	REP #$20
@@ -22,7 +23,7 @@ DrawDungeonCompassCounts:
 		LDX.b $07 : TXA : ORA #$2400 : STA $7EC79C
 	PLX
 
-	LDA $7EF4C0, X : AND #$00FF
+	LDA $7EF4BF, X : AND #$00FF
 	SEP #$20
 	JSR HudHexToDec2Digit
 	REP #$20
diff --git a/inventory.asm b/inventory.asm
index 9929b44..4214a57 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -316,11 +316,14 @@ AddInventory:
 	SEP #$20 ; Set 8-bit Accumulator
 
 	LDA $040C ; get dungeon id
+	BNE +
+		INC #2 ; treat sewers as HC
+	+ CMP #$FF : BEQ .fullItemCounts
 
 	CMP.l BallNChainDungeon : BNE +
 		CPY.b #$32 : BNE +
 		BRL .fullItemCounts
-	+ LSR : TAX : LDA $7EF4C0, X : INC : STA $7EF4C0, X
+	+ LSR : TAX : LDA $7EF4BF, X : INC : STA $7EF4BF, X
 	CPX.b #$0D : BNE +
 		LDA $7EF366 : AND #$04 : BNE ++
 			JSR .incrementGTowerPreBigKey
diff --git a/overrides.asm b/overrides.asm
index 7db52a2..0295597 100644
--- a/overrides.asm
+++ b/overrides.asm
@@ -1,5 +1,4 @@
 ;================================================================================
-;================================================================================
 ; Lamp Mantle & Light Cone Fix
 ;--------------------------------------------------------------------------------
 ; Output: 0 for darkness, 1 for lamp cone
@@ -12,7 +11,7 @@ LampCheckOverride:
 
 	LDA $7EF3CA : BNE +
 		.lightWorld
-		LDA $040C : CMP.b #$02 : BNE ++ ; check if we're in HC
+		LDA $040C : CMP.b #$04 : !BGE ++ ; check if we're in HC
 			LDA LampConeSewers : BRA .done
 		++
 			LDA LampConeLightWorld : BRA .done