More fixes for headers