diff --git a/auto/config b/auto/config
index 1168443..962e2ab 100755
--- a/auto/config
+++ b/auto/config
@@ -23,15 +23,15 @@ while [ $# -gt 0 ]; do
 		temp="$temp "'"'"$2"'"'
 		shift
 		;;
-	--proposed-updates)
+	-p|--proposed-updates)
 		enable_pu="1"
 		;;
-	--kali-dev)
+	-d|--kali-dev)
 		dist="kali-dev"
 		# No security repo
 		lb_opts="--security false --initsystem systemd"
 		;;
-	--kali-rolling)
+	-r|--kali-rolling)
 		dist="kali-rolling"
 		lb_opts="--initsystem systemd"
 		;;
diff --git a/build.sh b/build.sh
index f25d0db..798e7f9 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
+set -o pipefail  # Bashism
 
 KALI_DIST=kali
 KALI_VERSION="${VERSION:-daily}"
@@ -37,6 +38,7 @@ run_and_log() {
 	else
 		"$@" >>build.log 2>&1
 	fi
+	return $?
 }
 
 # Parsing command line options