diff --git a/.buildkite/instantiate_and_test.sh b/.buildkite/instantiate_and_test.sh
index ccfce33..23d0711 100644
--- a/.buildkite/instantiate_and_test.sh
+++ b/.buildkite/instantiate_and_test.sh
@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
-#set -euo pipefail
-
-echo "+++ DEBUG"
-echo "PATH=$PATH"
-ls -la /c/buildkite-agent
+set -euo pipefail
 
 julia --project=test -e 'import Pkg; Pkg.instantiate()'
 echo '+++ runtests.jl'
diff --git a/.buildkite/test_linux.yml b/.buildkite/test_linux.yml
index bf45a6b..c0d273f 100644
--- a/.buildkite/test_linux.yml
+++ b/.buildkite/test_linux.yml
@@ -1,9 +1,10 @@
 steps:
   - label: ":julia: :linux: ${ARCH?} Julia ${JULIA_VERSION?}"
     plugins:
+      # Install Julia for the agent first, so that we can run `sandbox`
       - JuliaCI/julia#v1:
-          version: "${JULIA_VERSION?}"
-          arch: "${ARCH?}"
+          version: "1"
+          arch: "${AGENT_ARCH?}"
       - staticfloat/sandbox#v1:
           rootfs_url: "${ROOTFS_URL?}"
           rootfs_treehash: "${ROOTFS_HASH?}"
@@ -11,6 +12,10 @@ steps:
           gid: 0
           workspaces:
             - "/cache:/cache"
+      # Then install Julia for the rootfs arch
+      - JuliaCI/julia#v1:
+          version: "${JULIA_VERSION?}"
+          arch: "${ARCH?}"
       - staticfloat/metahook#sf/windows_backslashes:
           pre-command: |
             # Upgrade our debian package to bullseye (wowza) and get an ILP64 blas
diff --git a/.buildkite/test_windows.yml b/.buildkite/test_windows.yml
index 31ed959..9e0b1f1 100644
--- a/.buildkite/test_windows.yml
+++ b/.buildkite/test_windows.yml
@@ -3,6 +3,7 @@ steps:
     plugins:
       - JuliaCI/julia#v1:
           version: "${JULIA_VERSION?}"
+          arch: "${ARCH?}"
       - staticfloat/metahook#sf/windows_backslashes:
           # Copy our julia installation to a known location that we can mount with docker
           pre-command: |
diff --git a/src/trampolines/common.h b/src/trampolines/common.h
index d31d245..a9e6c13 100644
--- a/src/trampolines/common.h
+++ b/src/trampolines/common.h
@@ -25,6 +25,9 @@
                             .ascii STR(-export:##I(MANGLE(name))); \
                             .ascii " "; \
                             .section .text
+#elif defined(__ELF__)
+#define DEBUGINFO(name)     .type UNDERSCORE(MANGLE(name)),@function
+#define EXPORT(name)        .size UNDERSCORE(MANGLE(name)), . - UNDERSCORE(MANGLE(name))
 #else
 #define DEBUGINFO(name)
 #define EXPORT(name)