Leaderboard fixes / cleanup