Some changes in comparable and comparator.