Fixing up some changes in the flow