Some sort changes