Some style header fixes.