Use new syntax for sort, as sorting didn't work properly
Upgrade dependencies