Fix a few bugs in CPU running count