More header fixing