Minor workflow fixes as they come up, making my way through a use case and
cleaning up workflow problems as they come along.