type header fixes