Tweaked some statistics queries