More fixes to stats

Signed-off-by: Braiam Peguero <braiamp@gmail.com>