Few fixes about statistics