Fix header fields