fix orch issues