Fix and improve stats accuracy