Sort fixes