Small fixes to bugs in mfd and nrml04_parser