diff --git a/HACKERS_README b/HACKERS_README
index 46d4b589..004b8612 100755
--- a/HACKERS_README
+++ b/HACKERS_README
@@ -27,10 +27,9 @@ set -x
 export PATH="$PATH:$(pwd -P)/bin"
 export __cdist_conf_dir="$(pwd -P)/conf"
 
-# Change paths so we can debug stuff :-)
-export __cdist_out_dir=/tmp/localhost
+export __cdist_local_base_dir=/tmp/localhost
 
 target="${1:-localhost}"
 cdist-deploy-to "$target"
 
-find "${__cdist_out_dir}"
+find "${__cdist_local_base_dir}"
diff --git a/bin/cdist-config b/bin/cdist-config
index 5dccf4ea..2778272e 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -90,7 +90,8 @@ __cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")
 __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
 
 # Local output base directory
-: ${__cdist_out_dir:=$__cdist_tmp_dir/$__cdist_name_out_dir}
+: ${__cdist_local_base_dir:=$__cdist_tmp_dir}
+: ${__cdist_out_dir:=$__cdist_local_base_dir/$__cdist_name_out_dir}
 : ${__cdist_out_explorer_dir:=$__cdist_out_dir/$__cdist_name_explorer}
 : ${__cdist_out_object_dir:=$__cdist_out_dir/$__cdist_name_object}
 : ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin}
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 54cd4623..b0132beb 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -40,11 +40,12 @@ cdist-explorer-run-init       "$__cdist_target_host" "$__cdist_out_explorer_dir"
 # Create initial object base
 cdist-manifest-init           "$__cdist_target_host" "$__cdist_out_object_dir"
 
+# Create dependent objects
+cdist-manifest-run-all        "$__cdist_target_host" "$__cdist_out_object_dir"
+
 exit 2
 
-cdist-manifest-run-all        "$__cdist_target_host" "$__cdist_out_object_dir"
 cdist-object-explorer-all     "$__cdist_target_host" "$__cdist_out_object_dir"
-exit 0
 cdist-object-codegen-all      "$__cdist_target_host" "$__cdist_out_object_dir" "$__cdist_out_execs"
 cdist-exec-transfer           "$__cdist_target_host" "$__cdist_out_execs"
 cdist-exec-run                "$__cdist_target_host"
diff --git a/conf/types/__issue/manifest b/conf/types/__issue/manifest
index 5236d447..d38aeb92 100755
--- a/conf/types/__issue/manifest
+++ b/conf/types/__issue/manifest
@@ -21,7 +21,7 @@
 
 destination=/etc/issue
 
-case "$(cat "$__cdist_out_explorers/os")" in
+case "$(cat "out/explorers/os")" in
    archlinux)
       source="$(pwd -P)/files/archlinux"
    ;;