Little flow fixes