Fixes to WorkflowBuilder