Fixed many sorts.