Fix more sorting