diff --git a/plugins/00_dokku-standard/subcommands/cleanup b/plugins/00_dokku-standard/subcommands/cleanup
index c88a9901a..82fad03a0 100755
--- a/plugins/00_dokku-standard/subcommands/cleanup
+++ b/plugins/00_dokku-standard/subcommands/cleanup
@@ -4,7 +4,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 dokku_cleanup_cmd() {
   declare desc="cleans up old deployment cruft"
-  local cmd="cleanup"
+  declare cmd="cleanup"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
 
   docker_cleanup "$APP" "true"
 }
diff --git a/plugins/common/common.go b/plugins/common/common.go
index 551f4bfec..2348b534f 100644
--- a/plugins/common/common.go
+++ b/plugins/common/common.go
@@ -105,7 +105,7 @@ func GetDeployingAppImageName(appName, imageTag, imageRepo string) (imageName st
 
 	imageName = fmt.Sprintf("%s%s:%s", imageRemoteRepository, imageRepo, imageTag)
 	if !VerifyImage(imageName) {
-		LogFail(fmt.Sprintf("app image (%s) not found", imageName))
+		LogFail(fmt.Sprintf("App image (%s) not found", imageName))
 	}
 	return
 }
@@ -221,7 +221,7 @@ func GetAppImageName(appName, imageTag, imageRepo string) (imageName string) {
 	} else {
 		imageName = fmt.Sprintf("%v:%v", imageRepo, imageTag)
 		if !VerifyImage(imageName) {
-			LogFail(fmt.Sprintf("app image (%s) not found", imageName))
+			LogFail(fmt.Sprintf("App image (%s) not found", imageName))
 		}
 	}
 	return
diff --git a/plugins/common/functions b/plugins/common/functions
index 34599a5a4..725a3eae2 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -192,7 +192,7 @@ get_deploying_app_image_name() {
   [[ -z "$IMAGE_TAG" ]] && IMAGE_TAG="latest"
 
   local IMAGE="${IMAGE_REMOTE_REPOSITORY}${IMAGE_REPO}:${IMAGE_TAG}"
-  verify_image "$IMAGE" || dokku_log_fail "app image ($IMAGE) not found"
+  verify_image "$IMAGE" || dokku_log_fail "App image ($IMAGE) not found"
   echo "$IMAGE"
 }
 
@@ -207,7 +207,7 @@ get_app_image_name() {
 
   if [[ -n "$IMAGE_TAG" ]]; then
     local IMAGE="$IMAGE_REPO:$IMAGE_TAG"
-    verify_image "$IMAGE" || dokku_log_fail "app image ($IMAGE) not found"
+    verify_image "$IMAGE" || dokku_log_fail "App image ($IMAGE) not found"
   else
     local IMAGE="$IMAGE_REPO:latest"
   fi
@@ -402,7 +402,7 @@ is_container_status() {
   declare desc="return 0 if given docker container id is in given state"
   local CID=$1
   local TEMPLATE="{{.State.$2}}"
-  local CONTAINER_STATUS=$(docker inspect -f "$TEMPLATE" "$CID" || true)
+  local CONTAINER_STATUS=$(docker inspect -f "$TEMPLATE" "$CID" 2> /dev/null || true)
 
   if [[ "$CONTAINER_STATUS" == "true" ]]; then
     return 0
diff --git a/plugins/ps/subcommands/report b/plugins/ps/subcommands/report
index 7e32b7714..941201317 100755
--- a/plugins/ps/subcommands/report
+++ b/plugins/ps/subcommands/report
@@ -40,7 +40,7 @@ report_single_app() {
   local APP_CONTAINER_STATUS
   for CONTAINER_FILE in $CONTAINER_FILES; do
     CID=$(< "$DOKKU_ROOT/$APP/$CONTAINER_FILE")
-    APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$CID" 2> /dev/null)
+    APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Status}}' "$CID" 2> /dev/null || true)
     [[ -z "$APP_CONTAINER_STATUS" ]] && APP_CONTAINER_STATUS="missing"
     STATUSES+=("${CONTAINER_FILE#*.}:$APP_CONTAINER_STATUS#${CID:0:12}")
   done
diff --git a/plugins/scheduler-docker-local/post-delete b/plugins/scheduler-docker-local/post-delete
index 59297b3ec..fe180e91a 100755
--- a/plugins/scheduler-docker-local/post-delete
+++ b/plugins/scheduler-docker-local/post-delete
@@ -20,7 +20,7 @@ scheduler-docker-local-post-delete() {
   local DOKKU_APP_CIDS=$(docker ps -a --no-trunc | egrep "dokku/${APP}:" | awk '{ print $1 }' | xargs)
   if [[ -n "$DOKKU_APP_CIDS" ]]; then
     # shellcheck disable=SC2086
-    docker rm -f $DOKKU_APP_CIDS &>/dev/null || true
+    docker rm -f $DOKKU_APP_CIDS > /dev/null 2>&1 || true
   fi
 
   # shellcheck disable=SC2046
diff --git a/plugins/scheduler-docker-local/scheduler-stop b/plugins/scheduler-docker-local/scheduler-stop
index 466a1c40e..747f4b63a 100755
--- a/plugins/scheduler-docker-local/scheduler-stop
+++ b/plugins/scheduler-docker-local/scheduler-stop
@@ -27,7 +27,7 @@ scheduler-docker-local-scheduler-stop() {
 
     if [[ -n "$DOKKU_APP_CIDS" ]]; then
       # shellcheck disable=SC2086
-      docker rm -f $DOKKU_APP_CIDS > /dev/null || true
+      docker rm -f $DOKKU_APP_CIDS > /dev/null 2>&1 || true
     fi
   fi
 }
diff --git a/tests/unit/10_ps-herokuish.bats b/tests/unit/10_ps-herokuish.bats
index 5bef721db..22e2a7e95 100644
--- a/tests/unit/10_ps-herokuish.bats
+++ b/tests/unit/10_ps-herokuish.bats
@@ -142,7 +142,7 @@ teardown() {
   echo "status: "$status
   assert_success
 
-  run bash -c "dokku --trace ps:restore"
+  run bash -c "dokku ps:restore"
   echo "output: "$output
   echo "status: "$status
   assert_success