More Fixes to Sort