A couple Vagrant bootstrap bugfixes