minor flow tweaks