diff --git a/doorrando/hudadditions.asm b/doorrando/hudadditions.asm
index f6bca98..3b0d520 100644
--- a/doorrando/hudadditions.asm
+++ b/doorrando/hudadditions.asm
@@ -180,12 +180,14 @@ DrHudDungeonItemsAdditions:
         	lda.l DungeonReminderTable, x : sta.w $1644, y
         	iny #2
         	lda.w #$24f5 : sta.w $1644, y ; blank out map spot
-        	lda.l MapField : and.l DungeonMask, x : beq + ; must have map
+        	lda.l MapField : ora.l MapCountDisplay : ora.l MapOverlay
+        	and.l DungeonMask, x : beq + ; must have map
         		JSR MapIndicatorShort : STA.w $1644, Y
 			+ iny #2
             cpx.w #$001a : bne +
 				tya : !ADD.w #$003c : tay
-			+ lda.l CompassField : and.l DungeonMask, x : beq + ; must have compass
+			+ lda.l CompassField : ora.l CompassCountDisplay
+			and.l DungeonMask, x : beq + ; must have compass
                 phx ; total chest counts
                     LDA.l CompassTotalsWRAM, x : !SUB.l DungeonLocationsChecked, x
                     SEP #$30 : JSR HudHexToDec2DigitCopy : REP #$30
diff --git a/newitems.asm b/newitems.asm
index a7d66bd..77df26a 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -1210,7 +1210,7 @@ MaybeFlagDungeonTotalsEntrance:
                 LDA.l CompassMode : AND.w #$000F : BEQ .maps ; Skip if we're not showing compass counts
                         JSR FlagCompassCount
                 .maps
-;                LDA.l MapHUDMode : AND.w #$000F : BEQ .done
+                LDA.l MapHUDMode : AND.w #$000F
                         LDX.w DungeonID
                         JSR FlagMapCount
         .done
@@ -1225,7 +1225,7 @@ FlagCompassCount:
 RTS
 ;--------------------------------------------------------------------------------
 FlagMapCount:
-;        CMP.w #$0002 : BEQ .mapShown
+        CMP.w #$0002 : BEQ .mapShown
         LDA.l MapMode : AND.w #$00FF : BEQ .mapShown
                 LDA.l MapField : AND.l DungeonItemMasks, X : BEQ .done ; skip if we don't have map
                         .mapShown