Various fixes around section/clause