More fixes for header