openradar12954582

Two bug fixes and a change to cater for new section inserts which fail with a known radar bug (12954582)