Fix zone names, and gather more statistics