Vagrant types and minor fixes