More header tweaks.