Add leaderborad instances and fix the 0-duration problem in the samples