diff --git a/src/constants.a b/src/constants.a
index a833c0530..8d343d4ff 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -9,7 +9,7 @@
 ; D000..E611 - persistent data structures (per-game cheat categories,
 ;              gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
-; EC23..FFF9 - main program code
+; EC24..FFF9 - main program code
 ; FFFA..FFFF - NMI, reset, IRQ vectors
 ;
 ; LC RAM BANK 2
diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a
index 16b24d149..f87aa5e47 100644
--- a/src/ui.attract.mode.a
+++ b/src/ui.attract.mode.a
@@ -95,7 +95,7 @@ MiniAttractMode
          +LDADDR gAttractModeStore
          jsr   okvs_len
          cmp   @MiniAttractIndex
-         beq   @exit                 ; we've run through all modules, so exit to caller
+         beq   ATTRTS                ; we've run through all modules, so exit to caller
 
 @MiniAttractIndex=*+1
          ldx   #$FD                  ; SMC
@@ -112,7 +112,7 @@ MiniAttractMode
          inc   @MiniAttractIndex
          lda   KBD
          bpl   @loop
-@exit    rts
+ATTRTS   rts
 
 ;------------------------------------------------------------------------------
 ; RunAttractModule
@@ -142,9 +142,7 @@ RunAttractModule
 
          +LDAY @key
          jsr   GetGameInfo
-         bcc   +                     ; if game doesn't exist, skip the demo
-         rts
-+
+         bcs   ATTRTS                ; if game doesn't exist, skip the demo
          cpx   #$FF
          beq   +
          stx   gGameToLaunch