Minor header fixes