diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index fdda1646..b376912a 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -30,6 +30,9 @@ __cdist_target_host="$1"
 # Make target host available for non-core
 export $__cdist_name_var_target_host="$__cdist_target_host"
 
+# Export variables for core, which others do not reset
+export __cdist_local_base_dir
+
 ################################################################################
 # See cdist-stages(7)
 #
diff --git a/conf/type/__file/gencode b/conf/type/__file/gencode
index 4e54bfb5..e0398877 100755
--- a/conf/type/__file/gencode
+++ b/conf/type/__file/gencode
@@ -41,6 +41,7 @@ if ! $(echo "$destination" | grep -q ^/); then
 fi
 
 # Copy source if existing
+# FIXME: directory handling not supported - add recursive flag?
 if [ -f "$__object/parameter/source" ]; then
    source="$(cat "$__object/parameter/source")"
 
@@ -59,7 +60,6 @@ if [ -f "$__object/parameter/source" ]; then
       # Probably describe it in cdist-quickstart...
       scp "$source" "root@${__target_host}:${destination}"
    fi
-
 # No source? Create empty file/dir
 else
    case "$type" in
diff --git a/conf/type/__issue/manifest b/conf/type/__issue/manifest
index a4cb703b..cdaeefc2 100755
--- a/conf/type/__issue/manifest
+++ b/conf/type/__issue/manifest
@@ -22,6 +22,8 @@
 destination=/etc/issue
 os="$(cat "out/explorer/os")"
 
+set -x
+
 case "$os" in
    archlinux)
       source="$__type/files/archlinux"
@@ -32,4 +34,4 @@ case "$os" in
 esac
 
 # FIXME: replace id with $destination post-1.0
-__file etc-issue --source "$source" --destination "$destination" --type file
+__file "$destination" --source "$source" --type file