Counting fixes.