Uncomment necessary code and fix stat counter queueing

Uncomment necessary code and fix stat counter queueing