diff --git a/generate-tar b/generate-tar
index c94e325..f23f513 100755
--- a/generate-tar
+++ b/generate-tar
@@ -230,8 +230,9 @@
   cd "${pnor_dir}"
   # Set permissions of partition files to read only
   chmod 440 -- *
-  # shellcheck disable=SC2086 # Do not quote partitions since it lists multiple
-  # files and mksquashfs would assume to be a single file name within quotes
+  # shellcheck disable=SC2048,SC2086 # Do not quote partitions since it lists
+  # multiple files and mksquashfs would assume to be a single file name within
+  # quotes
   mksquashfs ${tocfile} ${partitions[*]} "${scratch_dir}"/pnor.xz.squashfs -all-root
   cd "${scratch_dir}"
   files_to_sign+=" pnor.xz.squashfs"
diff --git a/vpnor/obmc-vpnor-util b/vpnor/obmc-vpnor-util
index e69390e..b02bfd8 100644
--- a/vpnor/obmc-vpnor-util
+++ b/vpnor/obmc-vpnor-util
@@ -70,7 +70,7 @@
   lowestPriority=255
   for element in "${array[@]}"; do
     #Remove the PNOR_RO_PREFIX from the path to get version ID.
-    versionId="${element#${PNOR_RO_PREFIX}}"
+    versionId="${element#"${PNOR_RO_PREFIX}"}"
 
     # Get the priority of active versions from persistence files.
     if [[ -f "${PERSISTENCE_PATH}${versionId}" ]]; then