Bug Fixes to Workflow and DSC