Fixes for `vagrant up`

Rebased off #398. @yarko, since there were conflicts, can you please review and make sure this looks good?