Vagrant VM fixes

ping @lmars