Fixes to encounter counts