Fixing header references.