Minor fixes and work around Fixed Header