Bug fixes when additional section present