Some MvM fixes.