Class header fixes