Fixup headers.