orchestration minor fixes