Some minor flow tweaks