Rank and title fixes