Fix header handling.