Changes to ensure Vagrant works properly