Fixed ranking issues