diff --git a/Overworld/world_map.asm b/Overworld/world_map.asm
index d485187..31ba67f 100644
--- a/Overworld/world_map.asm
+++ b/Overworld/world_map.asm
@@ -209,16 +209,14 @@ MapIconDraw:
   LDA.l OOSPROG : CMP.b #$02 : BNE +
     JSL DrawHallOfSecretsIcon
     JSR HandleMapDrawIcon
-    JMP .main_quest
   +
   LDA.l OOSPROG : AND.b #$10 : BEQ .main_quest
-    ; Pyramid of Power
     JSL DrawPyramidIcon
     JSR HandleMapDrawIcon_noflash
   .main_quest
 
   LDA.l MapIcon : CMP.b #$01 : BEQ .draw_crystal_1
-                  CMP.b #$02 : BEQ .draw_crystals
+                  CMP.b #$02 : BCS .draw_crystals
                     JSL DrawEonEscapeIcon
                     JSR HandleMapDrawIcon
                     JMP restore_coords_and_exit
diff --git a/Sprites/NPCs/village_elder.asm b/Sprites/NPCs/village_elder.asm
index 579de4b..68441dd 100644
--- a/Sprites/NPCs/village_elder.asm
+++ b/Sprites/NPCs/village_elder.asm
@@ -3,11 +3,11 @@ Sprite_VillageElder_Main:
   %PlayAnimation(2,3,16)
   JSL Sprite_PlayerCantPassThrough
   REP #$30
-  LDA.l MAPICON : AND.w #$00FF
+  LDA.l OOSPROG : AND.w #$00FF
   SEP #$30
-  CMP.b #$02 : BCS .already_met
+  AND.b #$10 : BNE .already_met
     %ShowSolicitedMessage($143) : BCC .no_message
-      LDA.b #$02 : STA.l $7EF3C7
+      LDA.l OOSPROG : ORA.b #$10 : STA.l OOSPROG
     .no_message
     RTS