Vagrant fixes for 1.0