flow: fixes for hairy functions