Fixes for stats