Even more heading fixes