Various MvM fixes