More fixes to header