Correct errors with $count_person etc.