Improve vsphere shutdown