diff --git a/stack.sh b/stack.sh
index a7eacbf..a953c9e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -297,6 +297,13 @@ function git_clone {
         cd $2
         # This checkout syntax works for both branches and tags
         git checkout $3
+    elif [[ "$RESET_BRANCHES" == "yes" ]]; then
+        cd $2
+        git remote set-url origin $1
+        git fetch origin
+        git checkout origin/$3
+        git branch -D $3
+        git checkout -b $3
     fi
 }
 
@@ -322,10 +329,10 @@ git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH
 
 # setup our checkouts so they are installed into python path
 # allowing ``import nova`` or ``import glance.client``
-cd $NOVA_DIR; sudo python setup.py develop
-cd $NOVACLIENT_DIR; sudo python setup.py develop
 cd $KEYSTONE_DIR; sudo python setup.py develop
 cd $GLANCE_DIR; sudo python setup.py develop
+cd $NOVACLIENT_DIR; sudo python setup.py develop
+cd $NOVA_DIR; sudo python setup.py develop
 cd $OPENSTACKX_DIR; sudo python setup.py develop
 cd $DASH_DIR/django-openstack; sudo python setup.py develop
 cd $DASH_DIR/openstack-dashboard; sudo python setup.py develop
diff --git a/tools/build_lxc.sh b/tools/build_lxc.sh
index 42bd328..580581b 100755
--- a/tools/build_lxc.sh
+++ b/tools/build_lxc.sh
@@ -32,7 +32,7 @@ CONTAINER_IP=${CONTAINER_IP:-192.168.1.50}
 CONTAINER_CIDR=${CONTAINER_CIDR:-$CONTAINER_IP/24}
 CONTAINER_NETMASK=${CONTAINER_NETMASK:-255.255.255.0}
 CONTAINER_GATEWAY=${CONTAINER_GATEWAY:-192.168.1.1}
-NAMESERVER=${NAMESERVER:-$CONTAINER_GATEWAY}
+NAMESERVER=${NAMESERVER:-`cat /etc/resolv.conf | grep nameserver | head -1 | cut -d " " -f2`}
 COPYENV=${COPYENV:-1}
 DEST=${DEST:-/opt/stack}
 WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1}
@@ -119,12 +119,14 @@ if [ ! -f $CACHEDIR/bootstrapped ]; then
     lxc-destroy -n $CONTAINER
     # trigger the initial debootstrap
     create_lxc
-    chroot $CACHEDIR apt-get update
-    chroot $CACHEDIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`
-    chroot $CACHEDIR pip install `cat files/pips/*`
     touch $CACHEDIR/bootstrapped
 fi
 
+# Make sure that base requirements are installed
+chroot $CACHEDIR apt-get update
+chroot $CACHEDIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`
+chroot $CACHEDIR pip install `cat files/pips/*`
+
 # Clean out code repos if directed to do so
 if [ "$CLEAN" = "1" ]; then
     rm -rf $CACHEDIR/$DEST
@@ -282,6 +284,7 @@ if [ "$WAIT_TILL_LAUNCH" = "1" ]; then
     TAIL_PID=$!
 
     function kill_tail() {
+        kill $TAIL_PID
         exit 1
     }