Small improvements in MFP data loader