Modified some more sorts to make them play nice.