Fixed the usage trackers, gjslint errors/warnings.