Fix the weirdness of the headers.