diff --git a/cookbooks/aws-parallelcluster-environment/files/setup-ephemeral-drives.sh b/cookbooks/aws-parallelcluster-environment/files/setup-ephemeral-drives.sh
index 0393774ca..4747a0eec 100644
--- a/cookbooks/aws-parallelcluster-environment/files/setup-ephemeral-drives.sh
+++ b/cookbooks/aws-parallelcluster-environment/files/setup-ephemeral-drives.sh
@@ -72,7 +72,7 @@ function print_block_device_mapping {
 function check_instance_store {
   if ls /dev/nvme* >& /dev/null; then
     IS_NVME=1
-    MAPPINGS=$(realpath --relative-to=/dev/ -P /dev/disk/by-id/nvme*Instance_Storage* | grep -v "Instance_Storage" | uniq)
+    MAPPINGS=$(realpath --relative-to=/dev/ -P /dev/disk/by-id/nvme*Instance_Storage* | grep -v "\*Instance_Storage\*" | uniq)
   else
     IS_NVME=0
     set_imds_token
diff --git a/util/cinc-install.sh b/util/cinc-install.sh
index 14d825014..fa25fb435 100644
--- a/util/cinc-install.sh
+++ b/util/cinc-install.sh
@@ -75,8 +75,6 @@ checksum_mismatch() {
 unable_to_retrieve_package() {
   echo "Unable to retrieve a valid package!"
   report_bug
-  # shellcheck disable=SC2154
-  echo "Metadata URL: $metadata_url"
   if test "x$download_url" != "x"; then
     echo "Download URL: $download_url"
   fi
@@ -108,7 +106,6 @@ http_404_error() {
   echo "that $platform is not supported."
   echo ""
   # deliberately do not call report_bug to suppress bug report noise.
-  echo "Metadata URL: $metadata_url"
   if test "x$download_url" != "x"; then
     echo "Download URL: $download_url"
   fi