diff --git a/.github/workflows/aomp-shell.yml b/.github/workflows/aomp-shell.yml
index 27e573e1e6..1f43fdf20e 100644
--- a/.github/workflows/aomp-shell.yml
+++ b/.github/workflows/aomp-shell.yml
@@ -25,12 +25,13 @@ jobs:
       - name: Echo changed files
         run: |
           echo "Changed files: ${{ steps.changed-files.outputs.all_changed_files }}"
+          echo "Git diff files: $(git diff --name-only HEAD~1 HEAD)"
 
       - name: Run shellcheck
         run: |
           shellcheck_status=0
-          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
-            if [[ $file == *.sh ]] || [[ $(file "$file") =~ "shell script" ]]; then
+          while read -r file; do
+            if [[ "$file" == *.sh ]] || [[ $(file "$file") =~ "shell script" ]]; then
               file_dir=$(dirname "$file")
               file_name=$(basename "$file")
 
@@ -43,6 +44,6 @@ jobs:
 
               popd || exit 1
             fi
-          done
+          done <<< $(git diff --name-only HEAD~1 HEAD)
           exit $shellcheck_status
         shell: bash {0}
diff --git a/srock-bin/build_cmake.sh b/srock-bin/build_cmake.sh
index 26cc44a482..2207e80ff6 100755
--- a/srock-bin/build_cmake.sh
+++ b/srock-bin/build_cmake.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 #
+# build_cmake.sh : build cmake and ninja
+#
 #Copyright © Advanced Micro Devices, Inc., or its affiliates.
 #
 #SPDX-License-Identifier:  MIT
diff --git a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp
index a7f35c0b99..d97e2e8821 100644
--- a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp
+++ b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp
@@ -38,7 +38,7 @@ int main() {
   /// CHECK-NOT: data_retrieve_async: {{.*}} 0 ({{.*}} 4, {{.*}})
   #pragma omp target update from(z[:10])
 
-  /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled. This may cause problems when using an OS-allocated pointer inside a target region. Re-run with HSA_XNACK=1 to remove this warning.
+  /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled or not supported. If your device supports XNACK, re-run with HSA_XNACK=1. If your device does not support XNACK, remove USM pragma and use map clauses instead. Set OMPX_EAGER_ZERO_COPY_MAPS=1 for optimal zero-copy performance on non-XNACK shared-memory devices.
 
   // Note: when the output is redirected rather than printed at the console,
   // the printf'd strings are printed AFTER all the OpenMP runtime library
diff --git a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp
index 61c69e523e..e6d339e625 100644
--- a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp
+++ b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp
@@ -38,7 +38,7 @@ int main() {
   /// CHECK-NOT: data_retrieve_async: {{.*}} 0 ({{.*}} 4, {{.*}})
   #pragma omp target update from(z[:10])
 
-  /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled. This may cause problems when using an OS-allocated pointer inside a target region. Re-run with HSA_XNACK=1 to remove this warning.
+  /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled or not supported. If your device supports XNACK, re-run with HSA_XNACK=1. If your device does not support XNACK, remove USM pragma and use map clauses instead. Set OMPX_EAGER_ZERO_COPY_MAPS=1 for optimal zero-copy performance on non-XNACK shared-memory devices.
 
   // Note: when the output is redirected rather than printed at the console,
   // the printf'd strings are printed AFTER all the OpenMP runtime library