Statistics fixes