diff --git a/core/__cdist_is_executable b/core/__cdist_is_executable
index f2907922..a7a6d174 100755
--- a/core/__cdist_is_executable
+++ b/core/__cdist_is_executable
@@ -18,7 +18,8 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Exec the code for the given object locally and remote
+# Test whether something is executable (that should be executable) or
+# is missing
 #
 
 __cdist_is_executable()
diff --git a/core/__cdist_manifest_run b/core/__cdist_manifest_run
index 8bf9cc51..60d3fea3 100755
--- a/core/__cdist_manifest_run
+++ b/core/__cdist_manifest_run
@@ -45,13 +45,9 @@ __cdist_manifest_run()
    # The actual run
    #
 
-   # Ensure binaries exist and are up-to-date
-   # FIXME: do only once! no need to check for every manifest!
+   # Ensure binaries are existing
    __cdist_type_build_emulation "${__cdist_out_type_bin_dir}" \
       || __cdist_exit_err "Failed to build type emulation binaries"
 
-   # prepend our path, so all cdist tools come before other tools
-   export PATH="${__cdist_out_type_bin_dir}:$PATH"
-
    __cdist_run_shell "${__cdist_manifest}"
 }
diff --git a/core/__cdist_run_shell b/core/__cdist_run_shell
index fecfba70..1d76e17b 100755
--- a/core/__cdist_run_shell
+++ b/core/__cdist_run_shell
@@ -24,7 +24,8 @@
 __cdist_run_shell()
 {
    set +e
-   sh -e "$@"
+   # Prepend our path, so all cdist tools come before other tools
+   PATH="${__cdist_out_type_bin_dir}:$PATH" sh -e "$@"
    if [ "$?" -ne 0 ]; then
       __cdist_echo error  "$1 exited non-zero"
       __cdist_echo warn "Faulty code:"