[Sorting]: Fixes according to diff comments