Stats Related Fixes