Header tweaks and fixes