More header fixup