More flowbit fixes!