Fix saving of master file fields