Header fixups.