Fixup header sizes