diff --git a/build_pxe_boot.sh b/build_pxe_boot.sh
index 9d44949f55..4f59ed69d6 100755
--- a/build_pxe_boot.sh
+++ b/build_pxe_boot.sh
@@ -55,7 +55,7 @@ if [ ! -r $PXEDIR/vmlinuz-${KVER} ]; then
 fi
 cp -p $PXEDIR/vmlinuz-${KVER} $DEST_DIR/ubuntu
 if [ ! -r $PXEDIR/stack-initrd.gz ]; then
-    cd $PXEDIR
+    cd $OPWD
     sudo $PROGDIR/build_pxe_ramdisk.sh $PXEDIR/stack-initrd.gz
 fi
 cp -p $PXEDIR/stack-initrd.gz $DEST_DIR/ubuntu
diff --git a/make_image.sh b/make_image.sh
index 81dd97c3e7..0d5074b790 100755
--- a/make_image.sh
+++ b/make_image.sh
@@ -144,7 +144,7 @@ dd if=/dev/null of=$TMPDISK bs=1M seek=$SIZE count=1
 if [ -n "$IMAGEONLY" ]; then
     # Build image from chroot
     sudo vmbuilder $HYPER ubuntu $ARGS \
-      --existing-chroot=$CHR \
+      --existing-chroot=$CHROOTDIR \
       --overwrite \
       --rootsize=$ROOTSIZE \
       --swapsize=$SWAPSIZE \