Preemptive fix of other places where .sort is used