BPMN and BPEL fixes