Fixes by headings