More header dummy tweaks