Fix collision glitch and leaderboard issue