A few fixes to counts.