Fix the headers used