diff --git a/src/launch.a b/src/launch.a
index f337fa8..d8316bc 100644
--- a/src/launch.a
+++ b/src/launch.a
@@ -99,11 +99,9 @@ LaunchInterpreter
          bcs   .playError
 
 ; put just the filename at $2006
+         +LDAY addrVersions
+         +STAY $00
          ldy   #0
-         lda   addrVersions
-         sta   $00
-         lda   addrVersions+1
-         sta   $01
 -        lda   ($00),y
          cmp   #$BD                  ; '='
          beq   .doneBuildingFilename
diff --git a/src/okvs.a b/src/okvs.a
index a8ff009..993fc1b 100644
--- a/src/okvs.a
+++ b/src/okvs.a
@@ -125,10 +125,8 @@ okvs_append
          jsr   derefptr              ; PTR -> next record
          bra   -
 +                                    ; PTR -> new record
-         lda   PTR                   ; save PTR on stack
-         pha
-         lda   PTR+1
-         pha
+         +LDAY PTR
+         +STAY SAVE                  ; save PTR
          jsr   incptr
          jsr   incptr                ; PTR -> space for new key
          ldy   #3
@@ -183,10 +181,8 @@ okvs_append
          inc   PTR+1
 +        lda   PTR+1
          sta   SRC+1                 ; SRC -> byte after this record
-         pla
-         sta   PTR+1
-         pla
-         sta   PTR                   ; PTR -> this record again
+         +LDAY SAVE
+         +STAY PTR                   ; PTR -> this record again
          lda   SRC                   ; update next-record pointer
          sta   (PTR)
          ldy   #1
diff --git a/src/path.a b/src/path.a
index 0592265..add57e1 100644
--- a/src/path.a
+++ b/src/path.a
@@ -39,13 +39,14 @@ AddToPath
          ldx   gPathname             ; current pathname length
          lda   ($00)                 ; length of this segment
          inc
-         sta   .a+1
+         sta   .len
          ldy   #$01
 -        lda   ($00),y
          sta   gPathname+1,x
          inx
          iny
-.a       cpy   #$FD                  ; SMC
+.len=*+1
+         cpy   #$FD                  ; SMC
          bcc   -
          stx   gPathname
          rts