Various Workflow fixes