Some header fixes