Tweaks to sort thingy