Various fixes to make Virtualbox + Vagrant v1.2 work