Small Vagrant improvements