diff --git a/setup.sh b/setup.sh
index c13f15b..1675819 100644
--- a/setup.sh
+++ b/setup.sh
@@ -76,7 +76,7 @@ while [ "$rootpassword" = "" ]; do
 		rootpassword=""
 	fi
 done
-admins=`dialog --no-items --no-cancel --title "Root pool ZFS RAID" --inputbox "List administrator e-mail addresses separated by comma:" 10 40 2>&1 1>/dev/tty`
+admins=`dialog --no-items --no-cancel --title "Administrators" --inputbox "List administrator e-mail addresses separated by comma:" 10 40 2>&1 1>/dev/tty`
 a=""; for x in `timedatectl list-timezones`; do a="$a $x" ; done
 
 
@@ -584,7 +584,7 @@ fi
 
 echo ""
 echo "Creating swap space..."
-errors=$(zfs create -V ${swapspace}K -b $(getconf PAGESIZE) -o compression=zle -o logbias=throughput -o sync=always -o primarycache=metadata -o secondarycache=none -o com.sun:auto-snapshot=false rpool/swap 2>&1 1>/dev/null && mkswap -f /dev/zvol/rpool/swap 2>&1 1>/dev/null)
+errors=$(zfs create -V ${swapspace}K -b $(getconf PAGESIZE) -o compression=zle -o logbias=throughput -o sync=always -o primarycache=metadata -o secondarycache=none -o com.sun:auto-snapshot=false rpool/swap 2>&1 1>/dev/null && (while ! [ -e "/dev/zvol/rpool/swap" ]; do sleep 1; done) && mkswap -f /dev/zvol/rpool/swap 2>&1 1>/dev/null)
 if ! [ "$?" = "0" ]; then
 	echo "Failed to create swap space - $errors"
 	exit 132