diff --git a/bin/compose b/bin/compose
index 5b720c6..6577d6d 100755
--- a/bin/compose
+++ b/bin/compose
@@ -359,11 +359,13 @@ get_volumes_for_container() {
 
 
 is_volume_used() {
-    local volume="$1"
+    local volume="$1" container_id src dst
 
     while read container_id; do
         while read-0 src dst; do
-            [ "$src" == "$volume" ] && return 0
+            [ "$src" == "$volume" ] && {
+                return 0
+            }
         done < <(get_volumes_for_container "$container_id")
     done < <(get_running_compose_containers)
     return 1
@@ -1059,7 +1061,7 @@ run() {
                        "$COMPOSE_LAUNCHER_BIN_OVERRIDE" \
                        "$@")
         if [ "$E" != "0" ]; then
-            err "Unexpecte failure while trying to replace compose file option."
+            err "Unexpected failure while trying to replace compose file option."
             return 1
         fi
         set -- "${cmd_args[@]}"
diff --git a/bin/compose-core b/bin/compose-core
index 2169ad8..a70d3e9 100755
--- a/bin/compose-core
+++ b/bin/compose-core
@@ -4495,7 +4495,7 @@ export COMPOSE_DOCKER_REGISTRY="${COMPOSE_DOCKER_REGISTRY:-docker.0k.io}"
 
 if [ -z "$DISABLE_SYSTEM_CONFIG_FILE" ]; then
     if [ -r /etc/default/charm ]; then
-        . /etc/default/charm
+        . "/etc/default/charm"
     fi
 
     if [ -r "/etc/default/$exname" ]; then