Final fixes for stats