general header fixes