Headbox tweaks