More header fixes