Recompiled and minor flow tweaks