[git pull] vmware fixes