Some more Vagrant fixes.