diff --git a/bin/cdist-config b/bin/cdist-config
index e56cd77a..d1adf760 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -130,7 +130,7 @@ __cdist_usage()
 
 __cdist_init_deploy()
 {
-   echo "Creating clean directory structur ..."
+   echo "Creating clean directory structure ..."
 
    # Ensure there is no old stuff, neither local nor remote
    rm -rf "$__cdist_local_base_dir"
diff --git a/bin/cdist-manifest-run-init b/bin/cdist-manifest-run-init
index 79329252..a775d5a5 100755
--- a/bin/cdist-manifest-run-init
+++ b/bin/cdist-manifest-run-init
@@ -31,4 +31,5 @@ __cdist_output_dir="$1"; shift
 
 eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"
 
+echo "Running initial manifest for $__cdist_target_host ..."
 cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init" "$__cdist_output_dir"
diff --git a/bin/cdist-object-codegen-all b/bin/cdist-object-codegen-all
index 204659dc..67f05186 100755
--- a/bin/cdist-object-codegen-all
+++ b/bin/cdist-object-codegen-all
@@ -37,7 +37,7 @@ __cdist_object_list "$__cdist_object_base_dir" > "$__cdist_tmp_file"
 
 while read object; do
    code="$(__cdist_object_code "$object")"
-   echo "Generating code for $object ..."
+   echo "Generating  code  for $object ..."
 
    cdist-object-codegen "$__cdist_target_host"     \
                         "$__cdist_object_base_dir" \
diff --git a/conf/manifest/init b/conf/manifest/init
index 30037481..17ba0e92 100755
--- a/conf/manifest/init
+++ b/conf/manifest/init
@@ -3,7 +3,6 @@
 #
 
 # This is debug and should not be in a production environment
-echo "Running initial manifest for $__target_host"
 echo "We could access other manifests in $__manifest"
 
 __file /etc/cdist-configured --type file