Fixing lots of cutflow bugs