Small corrections after merge of processor -> devel