More tweaks to the header lockup