Fix up finding of the header