A few header fixes