Fix and update client comparisons for the new structure.