Statistics and fixes