Fixup master_data