Fix vagrant snapshot regression bugs