Fix Leader bug and Rank bug