diff --git a/.cargo/config b/.cargo/config
index df13268ce..3241f7238 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,6 +1,6 @@
 [unstable]
 build-std = ["std", "core", "alloc", "panic_abort"]
-build-std-features = ["compiler-builtins-mem"]
+build-std-features = ["compiler-builtins-mem", "compiler-builtins-asm"]
 
 [build]
 target = "x86_64-unknown-hermit"
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 921808bdd..33895f2da 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -25,7 +25,7 @@ jobs:
 
 
     steps:
-      - uses: hecrj/setup-rust-action@v1.3.1
+      - uses: hecrj/setup-rust-action@v1
         with:
           rust-version: ${{ matrix.rust }}
           components: ${{ matrix.components || '' }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 517939ed2..8517ef1a7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
             targets: 'x86_64-unknown-linux-gnu'
 
     steps:
-    - uses: hecrj/setup-rust-action@v1.3.1
+    - uses: hecrj/setup-rust-action@v1
       with: 
          rust-version: ${{ matrix.rust }}
          components: ${{ matrix.components || '' }}
@@ -55,10 +55,14 @@ jobs:
           brew install qemu nasm
       if: ${{ matrix.os == 'macOS-latest' }}
     - name: Install qemu/nasm (windows)
+      uses: crazy-max/ghaction-chocolatey@v1
+      with:
+          args: install qemu nasm
+      if: ${{ matrix.os == 'windows-latest' }}
+    - name: Set path to qemu/nasm (Windows)
       run: |
-          choco install qemu nasm
-          echo "::add-path::C:\Program Files\NASM"
-          echo "::add-path::C:\Program Files\qemu"
+          echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:\Program Files\nasm" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       if: ${{ matrix.os == 'windows-latest' }}
     - name: Building dev version
       run:
@@ -71,6 +75,7 @@ jobs:
     - name: Build loader (unix)
       working-directory: loader
       run: make
+      if: ${{ ( matrix.os == 'macOS-latest' ) || ( matrix.os == 'ubuntu-latest' ) }}
     # Workaround since makefile doesn't work when using powershell
     - name: Build loader (windows)
       working-directory: loader