Vagrant build fixes