fixes to flows