Bugfixes found trying to integrate UR and Workflow Dependencies

This should still fail tests, because we don't have the UR/Workflow dependencies resolved.