Fix count data errors