Various MMR fixes tranche 2