More sorting tweaks