A couple more sorting tweaks.