diff --git a/build_nfs.sh b/build_nfs.sh
index f2a7b13..185d0ad 100755
--- a/build_nfs.sh
+++ b/build_nfs.sh
@@ -99,7 +99,7 @@ wget -c http://images.ansolabs.com/tty.tgz -O $CHROOTCACHE/natty-stack$DEST/file
 
 # Use this version of devstack?
 if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
-    rm -rf $$CHROOTCACHE/natty-stack/$DEST/devstack
+    rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack
     cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack
 fi
 
diff --git a/build_pxe_ramdisk.sh b/build_pxe_ramdisk.sh
index 63e2ed4..46eeb05 100755
--- a/build_pxe_ramdisk.sh
+++ b/build_pxe_ramdisk.sh
@@ -97,12 +97,12 @@ git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH
 
 # Use this version of devstack?
 if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
-    rm -rf $$CHROOTCACHE/natty-stack/$DEST/devstack
+    rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack
     cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack
 fi
 
 # build a new image
-BASE=build.$$
+BASE=$CHROOTCACHE/build.$$
 IMG=$BASE.img
 MNT=$BASE/