More Vagrant mess