More header tweaks (part 2).