Fix weave orchestration (or try to)