* Fix the flowid -> threadid calculation
* Some other little bits