Fix the headers