Fix slowness on stats save + Fix score