diff --git a/justfile b/justfile
index ce2d3c50..f56a44d7 100644
--- a/justfile
+++ b/justfile
@@ -123,7 +123,10 @@ _build-rom folder name:
     cp -v "$GBA_FILE" "examples/target/examples/$GAME_NAME.gba"
 
 gbafix *args:
-    (cd agb-gbafix && cargo run --release -- {{args}})
+    (cd agb-gbafix && cargo build --release && cd "{{invocation_directory()}}" && "$CARGO_TARGET_DIR/release/agb-gbafix" {{args}})
+
+addr2line *args:
+    (cd agb-addr2line && cargo build --release && cd "{{invocation_directory()}}" && "$CARGO_TARGET_DIR/release/agb-addr2line" {{args}})
 
 _all-crates target:
     for CARGO_PROJECT_FILE in agb-*/Cargo.toml agb/Cargo.toml tracker/agb-*/Cargo.toml; do \