More header improvements