Fixed the majority of the VM