Minor header tweaks