diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index c845e85..f89fa7e 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -10,7 +10,7 @@
 
 - name: Copy SSL Certs to ONOS so docker-compose can find it
   command: ansible onos-cord-1 -b -u ubuntu -m copy \
-    -a "src=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt dest={{ ansible_user_dir }}/cord/xos-certs.crt"
+    -a "src=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt dest=~/cord/xos-certs.crt"
 
 - name: Build ONOS image with docker-compose
   command: ansible onos-cord-1 -b -u ubuntu -m command \
@@ -29,5 +29,5 @@
 
 - name: Copy admin-openrc.sh into XOS container
   command: ansible xos-1 -b -u ubuntu -m copy \
-    -a "src=~/admin-openrc.sh dest={{ ansible_user_dir }}/xos/xos/configurations/{{ xos_configuration }}"
+    -a "src=~/admin-openrc.sh dest=~/xos/xos/configurations/{{ xos_configuration }}"
 
diff --git a/roles/onos-vm-install/files/onos-setup-playbook.yml b/roles/onos-vm-install/files/onos-setup-playbook.yml
index b18924b..446763f 100644
--- a/roles/onos-vm-install/files/onos-setup-playbook.yml
+++ b/roles/onos-vm-install/files/onos-setup-playbook.yml
@@ -75,6 +75,12 @@
         src=~/onos-docker-compose.yml
         dest={{ ansible_user_dir }}/cord/docker-compose.yml
 
+    - name: Make sure docker daemon is running
+      become: yes
+      service: 
+        name=docker
+        state=started
+
     - name: Pull docker image for ONOS
       command: docker pull onosproject/onos
 
diff --git a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
index 124a719..ce913e8 100644
--- a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
+++ b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
@@ -51,5 +51,5 @@
         dest={{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}/node_key
 
     - name: Pull docker images for XOS
-      command: docker-compose pull chdir={{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}
+      command: docker-compose pull chdir="{{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}"