More fixes for header

Fixing what I screwed up before