Some more fixes for headings