More MFR exploit fixes