More header changes.