Fixes for current stats