More minor header tweaks