Fix the header IDs