Fix New-VMs Issues