Improve support for VMware with updated sources