sort fixes