Fixed up headings issues (again)