Fixing field definitions.