Various workflow fixes