Fixe some VM installs, multiple cleanups