Vagrant improvements