More header tweaks. Thanks @nicksergeant.