Workflow Step Fixes