Fixing up header logic