Various fixes for Vagrant box usability