More sort fixes.