MvM scoreboard fixes