Fixes for leaderboard
Resolved conflict