Orchestration fixes