flowbit fixes - more to come!