Tidy up many missing changes of field names etc.