Small header tweaks