Statistics collector
Stat fixes