Fix warnings and rename stats/update check

- The warning fixing should have been picked up from #608 but were not.

- Give a bit more clarity to the stats/update checking via rename