Fixed some MFR compatibility.