Added fixes for Vagrant provisioning