diff --git a/.github/workflows/test-nodejs-addon-api.yaml b/.github/workflows/test-nodejs-addon-api.yaml
index 67eced551..5a6649846 100644
--- a/.github/workflows/test-nodejs-addon-api.yaml
+++ b/.github/workflows/test-nodejs-addon-api.yaml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-14, ubuntu-20.04, ubuntu-22.04, windows-latest]
+        os: [macos-11, macos-14, ubuntu-20.04, ubuntu-22.04] #, windows-latest]
         node-version: ["16", "17", "18", "19", "21", "22"]
         python-version: ["3.8"]
 
diff --git a/scripts/apk/build-apk-asr-2pass.sh.in b/scripts/apk/build-apk-asr-2pass.sh.in
index 74a6825f1..24c2cd3ea 100644
--- a/scripts/apk/build-apk-asr-2pass.sh.in
+++ b/scripts/apk/build-apk-asr-2pass.sh.in
@@ -37,6 +37,7 @@ mkdir -p apks
 pushd ./android/SherpaOnnx2Pass/app/src/main/assets/
 
 model_name1={{ first.model_name }}
+model_name=$model_name1
 type1={{ first.idx }}
 lang1={{ first.lang }}
 short_name1={{ first.short_name }}
@@ -50,6 +51,7 @@ rm -rf  *.tar.bz2
 ls -lh $model_name1
 
 model_name2={{ second.model_name }}
+model_name=$model_name2
 type2={{ second.idx }}
 lang2={{ second.lang }}
 short_name2={{ second.short_name }}
diff --git a/scripts/apk/generate-asr-2pass-apk-script.py b/scripts/apk/generate-asr-2pass-apk-script.py
index 8f075be67..8b0948a96 100755
--- a/scripts/apk/generate-asr-2pass-apk-script.py
+++ b/scripts/apk/generate-asr-2pass-apk-script.py
@@ -74,7 +74,7 @@ def get_2nd_models():
             pushd $model_name
 
             rm -v README.md
-            rm -fv test_wavs
+            rm -rfv test_wavs
             rm model.onnx
 
             ls -lh
@@ -90,7 +90,7 @@ def get_2nd_models():
             cmd="""
             pushd $model_name
 
-            rm -fv test_wavs
+            rm -rfv test_wavs
             rm -v README.md
             mv -v data/lang_char/tokens.txt ./
             rm -rfv data/lang_char