diff --git a/bin/cdist-object-explorer-run b/bin/cdist-object-explorer-run
index 7a5068e4..b782de55 100755
--- a/bin/cdist-object-explorer-run
+++ b/bin/cdist-object-explorer-run
@@ -45,7 +45,7 @@ if [ "$__cdist_has_explorer" ]; then
       __cdist_type_explorer_pushed_add "$__cdist_type"
    fi
 
-   echo "Running explorers for $__cdist_object ..."
+   __cdist_echo info "Running explorers for $__cdist_object ..."
    # Copy object parameters
    cdist-dir push "$__cdist_target_host"                          \
       "$(__cdist_object_parameter_dir "$__cdist_object")"         \
diff --git a/bin/cdist-object-gencode-run b/bin/cdist-object-gencode-run
index 4d21fec9..a24d78bc 100755
--- a/bin/cdist-object-gencode-run
+++ b/bin/cdist-object-gencode-run
@@ -32,11 +32,14 @@ __cdist_object="$1"; shift
 __cdist_code_local="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_local}"
 __cdist_code_remote="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_remote}"
 
-echo "Generating local code for $__cdist_object ..."
+# FIXME: check that no file is created if there is no gencode
+# probably move output code to cdist-object-gencode
+
+__cdist_echo info "Generating local code for $__cdist_object ..."
 cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
    "${__cdist_name_gencode_local}" > "${__cdist_code_local}"
 
-echo "Generating remote code for $__cdist_object ..."
+__cdist_echo info "Generating remote code for $__cdist_object ..."
 cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
    "${__cdist_name_gencode_remote}" > "${__cdist_code_remote}"