Fix problem with some field names.