Fixup headers from jb