More tweaks to get it working for Vagrant file