Workflow fixes