Pin more versions and fix sort order