Merge "Fix 2 bugs in fast mixer statistics" into jb-dev