MFR fixes part 1.