Fix a few counts