CHANGES tweeks
Fix handling of affix header