diff --git a/bin/cdist-config b/bin/cdist-config
index d5c0464c..cff9b03a 100644
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -21,15 +21,15 @@
 
 __cdist_version="1.8.0"
 
+# Enable debugging
+[ "$__cdist_debug" ] && set -x
+
 # Fail if something bogus is going on
 set -u
 
 # Fail if exited non-zero as well
 set -e
 
-# enable debugging
-[ "$__cdist_debug" ] && set -x
-
 ################################################################################
 # cconf standard vars prefixed with cdist
 
diff --git a/core/__cdist_object_all b/core/__cdist_object_all
index abac594d..0babdbf6 100755
--- a/core/__cdist_object_all
+++ b/core/__cdist_object_all
@@ -33,13 +33,9 @@ __cdist_object_all_object_all()
    # Ensure object dir exists, so marker can be created
    mkdir -p "${__cdist_out_object_dir}"
 
-   BUG: 
-      - where does $__cdist_objects_created get setup?
-      - why do we use a file?
-      core/__cdist_object_manifest_run:         touch "$__cdist_objects_created"
+   # FIXME: : - why do we use a file?
+   #    core/__cdist_object_manifest_run:         touch "$__cdist_objects_created"
 
-
-   exit 23
    # Loop until we do not create new objects anymore
    # which is equal to all objects have been run
    touch "$__cdist_objects_created"