Fix up some minor issues with defaults and headings