diff --git a/cdist/conf/type/__daemontools/manifest b/cdist/conf/type/__daemontools/manifest
index 656f4984..b04c7e07 100755
--- a/cdist/conf/type/__daemontools/manifest
+++ b/cdist/conf/type/__daemontools/manifest
@@ -9,6 +9,7 @@ __directory "$servicedir" --mode 700
 os=$(cat "$__global/explorer/os")
 init=$(cat "$__global/explorer/init")
 
+require=""
 case $os in
 	freebsd)
 		# TODO change to __start_on_boot once it supports freebsd
diff --git a/cdist/conf/type/__grafana_dashboard/manifest b/cdist/conf/type/__grafana_dashboard/manifest
index 2e9bd115..9cd1465d 100755
--- a/cdist/conf/type/__grafana_dashboard/manifest
+++ b/cdist/conf/type/__grafana_dashboard/manifest
@@ -3,6 +3,7 @@
 os=$(cat "$__global/explorer/os")
 os_version=$(cat "$__global/explorer/os_version")
 
+require=""
 case $os in
     debian|devuan)
         case $os_version in
diff --git a/cdist/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest
index adf9bd99..fad6a3a1 100755
--- a/cdist/conf/type/__jail/manifest
+++ b/cdist/conf/type/__jail/manifest
@@ -37,7 +37,7 @@ jaildir="$(cat "$__object/parameter/jaildir")"
 
 __directory "${jaildir}" --parents
 
-set -- "$@" "$__object_id" "--state" "$state"
+set -- "$@" "$__object_id"
 cd "$__object/parameter"
 for property in *; do
 	set -- "$@" "--$property" "$(cat "$property")"
diff --git a/cdist/conf/type/__letsencrypt_cert/manifest b/cdist/conf/type/__letsencrypt_cert/manifest
index 56e3532c..d6892c9b 100755
--- a/cdist/conf/type/__letsencrypt_cert/manifest
+++ b/cdist/conf/type/__letsencrypt_cert/manifest
@@ -91,7 +91,7 @@ if [ -f "${__object}/parameter/automatic-renewal" ]; then
 	renew_hook_param="${__object}/parameter/renew-hook"
 	renew_hook=""
 	if [ -f "${renew_hook_param}" ]; then
-		while read hook; do
+		while read -r hook; do
 			renew_hook="${renew_hook} --renew-hook \"${hook}\""
 		done < "${renew_hook_param}"
 	fi
diff --git a/cdist/conf/type/__mount/manifest b/cdist/conf/type/__mount/manifest
index 73937899..999d806c 100755
--- a/cdist/conf/type/__mount/manifest
+++ b/cdist/conf/type/__mount/manifest
@@ -31,7 +31,7 @@ printf " %s" "$type"
 options="$(cat "$__object/parameter/options")"
 printf " %s" "$options"
 printf " %s" "$(cat "$__object/parameter/dump")"
-printf " %s\n" "$(cat "$__object/parameter/pass")"
+printf ' %s\n' "$(cat "$__object/parameter/pass")"
 ) | \
 __block "$__object_name" \
    --file "/etc/fstab" \
diff --git a/cdist/conf/type/__postfix_master/manifest b/cdist/conf/type/__postfix_master/manifest
index 94b5044f..0960ea41 100755
--- a/cdist/conf/type/__postfix_master/manifest
+++ b/cdist/conf/type/__postfix_master/manifest
@@ -50,7 +50,6 @@ entry="$__object/files/entry"
       echo "# $(cat "$__object/parameter/comment")"
    fi
    printf "%s " "$service"
-   printf "%s " "$type"
    for parameter in type private unpriv chroot wakeup maxproc; do
       printf "%s " "$(cat "$__object/parameter/$parameter")"
    done
diff --git a/cdist/conf/type/__process/gencode-remote b/cdist/conf/type/__process/gencode-remote
index d14cf506..ec9691b9 100755
--- a/cdist/conf/type/__process/gencode-remote
+++ b/cdist/conf/type/__process/gencode-remote
@@ -52,8 +52,7 @@ case "$state_should" in
         if [ -f "$__object/parameter/stop" ]; then
             cat "$__object/parameter/stop"
         else
-            # TODO: what should be runs variable?
-            echo kill "${runs}"
+            echo kill "$(cat "$__object/parameter/runs")"
         fi
         echo "stopped" >> "$__messages_out"
     ;;
diff --git a/cdist/conf/type/__prometheus_alertmanager/manifest b/cdist/conf/type/__prometheus_alertmanager/manifest
index 3f417526..64ef76af 100755
--- a/cdist/conf/type/__prometheus_alertmanager/manifest
+++ b/cdist/conf/type/__prometheus_alertmanager/manifest
@@ -15,6 +15,7 @@ storage_path="$(cat "$__object/parameter/storage-path")"
 ##### INSTALL THE PACKAGE ###################################################
 
 require_pkg=""  # what to require if I want to require "the package"
+require=""
 if [ -f "$__object/parameter/install-from-backports" ]; then
 	os=$(cat "$__global/explorer/os")
 	os_version=$(cat "$__global/explorer/os_version")
diff --git a/cdist/conf/type/__prometheus_exporter/manifest b/cdist/conf/type/__prometheus_exporter/manifest
index 35e654e2..b9e14531 100644
--- a/cdist/conf/type/__prometheus_exporter/manifest
+++ b/cdist/conf/type/__prometheus_exporter/manifest
@@ -7,6 +7,7 @@ exporter="$(cat "$__object/parameter/exporter")"
 
 __user prometheus --system
 
+require=""
 case $exporter in
 	node)
 		TEXTFILES=/service/node-exporter/textfiles  # path for the textfiles collector
diff --git a/cdist/conf/type/__prometheus_server/manifest b/cdist/conf/type/__prometheus_server/manifest
index 63b7b438..8685130f 100755
--- a/cdist/conf/type/__prometheus_server/manifest
+++ b/cdist/conf/type/__prometheus_server/manifest
@@ -18,6 +18,7 @@ rule_files="$(cat "$__object/parameter/rule-files")"
 ##### INSTALL THE PACKAGE ###################################################
 
 require_pkg=""  # what to require if I want to require "the package"
+require=""
 if [ -f "$__object/parameter/install-from-backports" ]; then
 	os=$(cat "$__global/explorer/os")
 	os_version=$(cat "$__global/explorer/os_version")
diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index 8cac3449..f6ff74c3 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -61,7 +61,7 @@ _cksum() {
    echo "$1" | cksum | cut -d' ' -f 1
 }
 
-while read key; do
+while read -r key; do
    type_and_key="$(echo "$key" | tr ' ' '\n' | awk '/^(ssh|ecdsa)-[^ ]+/ { printf $1" "; getline; printf $1 }')"
    object_id="$(_cksum "$file")-$(_cksum "$type_and_key")"
    set -- "$object_id"