some header fixes