Rewrite a few more headings