6504: Minor cleanups
6504: counters++
6504: Test changes