diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh
index 046279656b..5fa7aa8529 100755
--- a/tools/xen/build_domU.sh
+++ b/tools/xen/build_domU.sh
@@ -10,7 +10,10 @@ fi
 # This directory
 TOP_DIR=$(cd $(dirname "$0") && pwd)
 
-# Source params - override xenrc params in your localrc to suite your taste
+# Source lower level functions
+. $TOP_DIR/../../functions
+
+# Source params - override xenrc params in your localrc to suit your taste
 source xenrc
 
 # Echo commands
@@ -134,17 +137,8 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 SR_UUID=`xe sr-list --minimal name-label="Local storage"`
 xe sr-param-set uuid=$SR_UUID other-config:i18n-key=local-storage
 
-# Clean nova if desired
-if [ "$CLEAN" = "1" ]; then
-    rm -rf $TOP_DIR/nova
-fi
-
 # Checkout nova
-if [ ! -d $TOP_DIR/nova ]; then
-    env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
-    cd $TOP_DIR/nova
-    git checkout $NOVA_BRANCH
-fi
+git_clone $NOVA_REPO $TOP_DIR/nova $NOVA_BRANCH
 
 # Install plugins
 cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/
diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index 73f9c025ec..58fda31a7a 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -36,7 +36,7 @@ MGT_VLAN=${MGT_VLAN:-101}
 MGT_DEV=${MGT_DEV:-eth0}
 
 # XVA Directory
-XVA_DIR=${XVA_DIR:-xvas}
+XVA_DIR=${XVA_DIR:-`pwd`/xvas}
 
 # Path to xva file
 XVA=${XVA:-$XVA_DIR/$GUEST_NAME.xva }