Fix leaderboard NPE, increase efficiency