fixes to orchestrator on new cluster