Misc fixes for Vagrant.EPS.Marketplace