diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34cac5f..ee4b3d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,14 +37,14 @@ jobs:
       uses: robinraju/release-downloader@v1
       with:
         repository: nitros9project/toolshed
-        fileName: toolshed-*.tgz
+        fileName: toolshed-unix*.tgz
         latest: true
         extract: false
         out-file-path: toolshed
 
     - name: Install Toolshed
       run: |
-        sudo tar xvf toolshed/toolshed-[0-9]*.*.tgz --strip-components=1 -C /usr/local/bin
+        sudo tar xvf toolshed/toolshed-unix*.tgz --strip-components=1 -C /usr/local/bin
         sudo ln -s /bin/bash /usr/local/bin/xroar
 
     - name: Install Lwtools
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b5ed5ef..044b914 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,14 +32,14 @@ jobs:
       uses: robinraju/release-downloader@v1
       with:
         repository: nitros9project/toolshed
-        fileName: toolshed-*.tgz
+        fileName: toolshed-unix*.tgz
         latest: true
         extract: false
         out-file-path: toolshed
 
     - name: Install Toolshed
       run: |
-        sudo tar xvf toolshed/toolshed-[0-9]*.*.tgz --strip-components=1 -C /usr/local/bin
+        sudo tar xvf toolshed/toolshed-unix*.tgz --strip-components=1 -C /usr/local/bin
         sudo ln -s /bin/bash /usr/local/bin/xroar
 
     - name: Install Lwtools
@@ -55,10 +55,10 @@ jobs:
       run: ls -al
 
     - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        files: "craigtst-*.tgz"
+        files: craigtst-*.tgz
 
 
diff --git a/Jamfile b/Jamfile
index ebcc032..cc21844 100644
--- a/Jamfile
+++ b/Jamfile
@@ -1,7 +1,7 @@
 
 SubDir coco-test ;
 
-disk = [ FDirName $(TOP) craigtst.dsk ] ;
+disk = [ FDirName $(SUBDIR) craigtst.dsk ] ;
 
 ASM = [ Glob $(SUBDIR) : *.asm ] ;