diff --git a/entrances.asm b/entrances.asm
index 6ad367b..84d84d9 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -81,7 +81,7 @@ AllowStartFromSingleEntranceCave:
 	PHA
 		TAX
 
-		LDA.l StartingAreaExitOffset, X
+		LDA.l StartingAreaExitOffset, X : AND.w #$00FF
 
 		BNE +
 			JMP .done
@@ -124,10 +124,11 @@ AllowStartFromSingleEntranceCave:
 		STZ $0699 ;zero out door overlays in case starting overworld door is not set
 
 		SEP #$20 ; set 8-bit accumulator
-		LDX $00
+		LDA $7EF3C8 : TAX
 		LDA.l StartingAreaOverworldDoor, X : STA.l $7F5099 ;Load overworld door
 
 		REP #$20 ; reset 16-bit accumulator
+		JSL.l CacheDoorFrameData
 
 		.done
 	PLA