Minor sorting changes