Some stats fixes