More fixing to the MDF parser