diff --git a/esxi-scripts/esxi-shutdown2.sh b/esxi-scripts/esxi-shutdown2.sh
index 0ce97698..43e14e45 100644
--- a/esxi-scripts/esxi-shutdown2.sh
+++ b/esxi-scripts/esxi-shutdown2.sh
@@ -1,7 +1,8 @@
 #/bin/sh
 
 echo "Putting the Host into maintenance mode ..."
-vim-cmd hostsvc/maintenance_mode_enter
+#vim-cmd hostsvc/maintenance_mode_enter
+esxcli system maintenanceMode set -e true -t 0 &
 
 VMS=`vim-cmd vmsvc/getallvms | grep -v Vmid | awk '{print $1}'`
 for VM in $VMS; do
diff --git a/offsite-power-check.sh b/offsite-power-check.sh
index baee53a8..acbd1e96 100755
--- a/offsite-power-check.sh
+++ b/offsite-power-check.sh
@@ -94,6 +94,7 @@ $(date)"
 							fi
 						done
 						rm -f ${PW_TMPFOLDER}/power.offsite.restored
+						rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE
 					fi
 				fi
 				logtime=$(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER}))