More miscellaneous header mods.