fixup! Miscellaneous header fixups