Correct rank recalculation on client, common improvements