Fix un-checked MFR API usage