Fixing bad field mappings.