More header tweaks