diff --git a/bin/compose-core b/bin/compose-core
index e1ca6e5..f893238 100755
--- a/bin/compose-core
+++ b/bin/compose-core
@@ -1642,7 +1642,7 @@ cache:image:registry:get() {
     if [[ "$out" != *"manifest unknown"* ]] && [[ "$out" != *"not found"* ]]; then
         print_status failure >&2
         Feed >&2
-        err "Failed to pull image '$COMPOSE_DOCKER_REGISTRY/$charm_image'" \
+        err-d "Failed to pull image '$COMPOSE_DOCKER_REGISTRY/$charm_image'" \
             "for ${DARKYELLOW}$service${NORMAL}:"
         e "$out"$'\n' | prefix "  ${GRAY}|${NORMAL} " >&2
         return 1
@@ -1810,9 +1810,8 @@ service_ensure_image_ready() {
         return 1
     }
     local service_quoted=${service//./\\.}
-
-    if specified_image=$(echo "$service_def" | shyaml get-value image 2>/dev/null); then
-        if [[ "$specified_image" == "$charm_image_name"* ]]; then
+    if specified_image=$(e "$service_def" | shyaml get-value image 2>/dev/null); then
+        if [[ "$specified_image" == "$charm_image_name:"* ]]; then
             ## Assume we already did the change
             printf "%s" "$specified_image" | tee "$cache_file"
             return 0
@@ -1834,7 +1833,7 @@ service_ensure_image_ready() {
             return 0
         fi
         src="$specified_image"
-        hash=$(echo "$specified_image" | md5sum | cut -f 1 -d " ") || return 1
+        hash=$(e "$specified_image"$'\n' | md5sum | cut -f 1 -d " ") || return 1
         type=fetch
 
         ## replace image by charm image