diff --git a/mkinitrd b/mkinitrd
index 38d1745..f7223c8 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -2,4 +2,4 @@
 
 . ./prepare-env
 
-pushd $root && find . | cpio --quiet -H newc -o | gzip -9 -n > ../morpheus.img && popd
+pushd $root && find . | cpio --quiet -H newc -o | gzip -9 -n > ../morpheus-initrd.img && popd
diff --git a/pkgbuild b/pkgbuild
index b904f01..ccc896c 100755
--- a/pkgbuild
+++ b/pkgbuild
@@ -5,8 +5,6 @@ if test -z "$1"; then
 	exit 1
 fi
 
-set -e -x
-
 . ./prepare-env
 
 if [ $(uname -m) != $arch ]; then
diff --git a/qemu-run-initrd b/qemu-run-initrd
index b0a7827..0dba3d5 100755
--- a/qemu-run-initrd
+++ b/qemu-run-initrd
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./prepare-env
+
 vdesock="/tmp/morpheus-vde"
 
 ps -ef | grep vde_switch | grep "sock $vdesock" | grep -v grep > /dev/null || {
@@ -8,4 +10,4 @@ ps -ef | grep vde_switch | grep "sock $vdesock" | grep -v grep > /dev/null || {
 }
 
 qemu-system-x86_64 -enable-kvm -smp 2 -m 1024 -net nic,model=ne2k_pci \
-	-net vde,sock="${vdesock}" -kernel root/boot/bzImage -initrd morpheus.img -append "quiet"
+	-net vde,sock="${vdesock}" -kernel $root/boot/bzImage -initrd morpheus-initrd.img -append "quiet"
diff --git a/stage0 b/stage0
index 6489ec7..d44bc7d 100755
--- a/stage0
+++ b/stage0
@@ -3,8 +3,6 @@
 # This is the stage0 script, it prepares a basic usable system
 # in $root.
 
-set -e -x
-
 . ./prepare-env
 
 if [ $(uname -m) != $arch ]; then