Fixes for Vagrant / Ansible provisioning