More work on MFR compatibility.