diff --git a/src/asm/asm.cond.s b/src/asm/asm.cond.s
index 5b202ac..60845bd 100644
--- a/src/asm/asm.cond.s
+++ b/src/asm/asm.cond.s
@@ -1817,7 +1817,7 @@ macfind
               sta   lableptr+2
               stz   ]offset
               lda   [lableptr]
-              and   #$0f
+              and   #label_mask
               sta   ]len2
               sep   $20
               ldx   #$02                   ;start at byte 2
diff --git a/src/asm/asm.dsk.s b/src/asm/asm.dsk.s
index 8549b09..0e0ce17 100644
--- a/src/asm/asm.dsk.s
+++ b/src/asm/asm.dsk.s
@@ -694,7 +694,7 @@ writerel     php                                                     ;must enter
              ldy           #$00
              stz           :offset
              lda           [lableptr]
-             and           #$0F
+             and           #label_mask
              bne           :stalen
              inc           :main
              jmp           :loop
diff --git a/src/link/link.vars.s b/src/link/link.vars.s
index 4ebb1c1..9d94712 100644
--- a/src/link/link.vars.s
+++ b/src/link/link.vars.s
@@ -262,10 +262,10 @@ offset            ds    2
 *shiftct ds 2
 
 
-errlable          ds    16,0
+errlable          ds    lab_size+1,0
 errpos            ds    2
 
-newlable          ds    18,0
+newlable          ds    lab_size+3,0
 
 segheader
 bytecnt           ds    4
diff --git a/src/link/linker.2.s b/src/link/linker.2.s
index c5f239a..0b724aa 100644
--- a/src/link/linker.2.s
+++ b/src/link/linker.2.s
@@ -796,7 +796,7 @@ findlable
                 lda         lablect
                 beq         :notfound
                 lda         labstr
-                and         #$000F
+                and         #label_mask
                 beq         :notfound
                 sta         ]len1
                 lda         labstr+$1