Some small header fixes