More header fixing for the W3C version