diff --git a/core/__cdist_manifest_run_init b/core/__cdist_manifest_run_init
index 18507252..e8fa63de 100755
--- a/core/__cdist_manifest_run_init
+++ b/core/__cdist_manifest_run_init
@@ -24,6 +24,7 @@
 
 __cdist_manifest_run_init()
 {
+   # FIXME: probably do not export but always set explicitly?
    export $__cdist_name_var_manifest="$__cdist_manifest_dir"
 
    __cdist_echo info "Running initial manifest for $__cdist_target_host "
diff --git a/core/__cdist_object_all b/core/__cdist_object_all
index 52661073..f9c505ff 100755
--- a/core/__cdist_object_all
+++ b/core/__cdist_object_all
@@ -26,7 +26,7 @@ __cdist_object_all()
 {
    [ $# -eq 1 ] || __cdist_usage "<command>"
 
-   __cdist_command="$1"; shift
+   __cdist_object_all_command="$1"; shift
 
    __cdist_objects="$__cdist_tmp_dir/objects"
 
@@ -50,7 +50,7 @@ __cdist_object_all()
 
       while [ $# -gt 0 ]; do
          __cdist_object="$1"; shift
-         $__cdist_command "$__cdist_object"
+         $__cdist_object_all_command "$__cdist_object"
       done
    done
 }