Minor updates to sorting etc.