Minor sorting tweaks