Correct headings
Support modman