Key Stats fixes