Fix issues with the persistence orchestrator refactor