fixes to counts and locators