Some minor changes of stats & caching