diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8aa7017..24c1294 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,8 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout vm6502
+        uses: actions/checkout@v4
 
       - name: Checkout xzintbit
         uses: actions/checkout@v4
diff --git a/src/error.s b/src/error.s
index b779286..7f325e4 100644
--- a/src/error.s
+++ b/src/error.s
@@ -24,7 +24,8 @@ report_error:
 
     add [reg_pc], 0, [rb - 1]
     add 16, 0, [rb - 2]
-    arb -2
+    add 0, 0, [rb - 3]
+    arb -3
     call print_num_radix
 
     add report_error_msg_end, 0, [rb - 1]
diff --git a/src/func_test_callback.s b/src/func_test_callback.s
index 6ab4695..23579f8 100644
--- a/src/func_test_callback.s
+++ b/src/func_test_callback.s
@@ -58,7 +58,8 @@ func_test_callback_failed:
 
     add [reg_pc], 0, [rb - 1]
     add 16, 0, [rb - 2]
-    arb -2
+    add 0, 0, [rb - 3]
+    arb -3
     call print_num_radix
 
     add func_test_failed_end, 0, [rb - 1]
diff --git a/src/func_test_header.s b/src/func_test_header.s
index 07ac0c0..bc491d4 100644
--- a/src/func_test_header.s
+++ b/src/func_test_header.s
@@ -1,5 +1,5 @@
 # This the header for the 6502 functional test binary.
-# It needs to be linked immediately after binary.o and immediately before the functional test binary itself.
+# It needs to be linked immediately before the functional test binary itself.
 
 # The binary is available in git repository https://github.com/Klaus2m5/6502_65C02_functional_tests
 
diff --git a/src/msbasic_header.s b/src/msbasic_header.s
index ddf8667..a83514b 100644
--- a/src/msbasic_header.s
+++ b/src/msbasic_header.s
@@ -1,5 +1,5 @@
 # This the header for the MS Basic binary.
-# It needs to be linked immediately after binary.o and immediately before the MS Basic binary itself.
+# It needs to be linked immediately before the MS Basic binary itself.
 
 .EXPORT binary_start_address
 .EXPORT binary_load_address
diff --git a/src/trace.s b/src/trace.s
index 295e94f..612406c 100644
--- a/src/trace.s
+++ b/src/trace.s
@@ -33,7 +33,8 @@ print_trace:
     # Print address
     add [reg_pc], 0, [rb - 1]
     add 16, 0, [rb - 2]
-    arb -2
+    add 0, 0, [rb - 3]
+    arb -3
     call print_num_radix
 
     out ':'
@@ -48,7 +49,8 @@ print_trace:
 
     add [rb + opcode], 0, [rb - 1]
     add 16, 0, [rb - 2]
-    arb -2
+    add 0, 0, [rb - 3]
+    arb -3
     call print_num_radix
 
     out ')'
@@ -67,7 +69,8 @@ print_trace_data_loop:
 
     add [rb - 3], 0, [rb - 1]
     add 16, 0, [rb - 2]
-    arb -2
+    add 0, 0, [rb - 3]
+    arb -3
     call print_num_radix
 
     add [rb + idx], 1, [rb + idx]