Experimental fixing of headers. Needs work.