Various header changes to support a fixed header when the time is right.