Fixes for field names.