diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 3436ca20..5eac578b 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -43,14 +43,11 @@ echo "cdist $__cdist_version: Configuring $__cdist_target_host"
 __cdist_init_deploy           "$__cdist_target_host"
 
 # Transfer cdist executables
-echo "Transferring cdist binaries ...X"
+echo "Transferring cdist binaries ..."
 cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 
-# Execute general explorers
 cdist-explorer-run-global     "$__cdist_target_host"
-
-# Create initial object base
-cdist-manifest-run-init       "$__cdist_target_host" "$__cdist_out_object_dir"
+cdist-manifest-run-init       "$__cdist_target_host"
 
 # Create dependent objects
 cdist-manifest-run-all        "$__cdist_target_host" "$__cdist_out_object_dir"
diff --git a/bin/cdist-manifest-run-init b/bin/cdist-manifest-run-init
index a775d5a5..f895bafa 100755
--- a/bin/cdist-manifest-run-init
+++ b/bin/cdist-manifest-run-init
@@ -23,13 +23,12 @@
 #
 
 . cdist-config
-[ $# -eq 2 ] || __cdist_usage "<target host> <outdir>"
+[ $# -eq 1 ] || __cdist_usage "<target host>"
 set -e
 
 __cdist_target_host="$1"; shift
-__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"
+cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init" "$__cdist_out_object_dir"