Fix field declarations.