diff --git a/install.sh b/install.sh
index 696913d056..a7f222a1d8 100755
--- a/install.sh
+++ b/install.sh
@@ -1468,7 +1468,7 @@ if [ "$UNINSTALL" = "no" ] ; then
     done
 
     # Remove old migrators
-    rm $LIB_LOCATION/ruby/onedb/*.rb
+    rm $LIB_LOCATION/ruby/onedb/*.rb &> /dev/null
 fi
 
 # --- Install/Uninstall files ---
diff --git a/src/vmm_mad/remotes/xen/shutdown b/src/vmm_mad/remotes/xen/shutdown
index b217235577..d7ed0a16c6 100755
--- a/src/vmm_mad/remotes/xen/shutdown
+++ b/src/vmm_mad/remotes/xen/shutdown
@@ -30,7 +30,7 @@ exec_and_log "$XM_SHUTDOWN $deploy_id" \
 
 OUT=$(gdm)
 
-while [ -n "$OUT" -a $(echo $OUT | awk '{print $5}') != "---s--" ]; do
+while [ -n "$OUT" -a "$(echo $OUT | awk '{print $5}')" != "---s--" ]; do
     sleep 1
     OUT=$(gdm)
 done