Some more flow changes