diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp
index a34d02f59..585d65600 100644
--- a/src/collection/collectionbackend.cpp
+++ b/src/collection/collectionbackend.cpp
@@ -658,7 +658,7 @@ QStringList CollectionBackend::GetAllArtistsWithAlbums(const QueryOptions &opt)
     artists << query2.Value(0).toString();
   }
 
-  return QStringList(artists.toList());
+  return QStringList(artists.values());
 
 }
 
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 4b534d505..c3db1a50c 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -1716,7 +1716,7 @@ void Playlist::ReshuffleIndices() {
       }
 
       // Shuffle them
-      QStringList shuffled_album_keys = album_key_set.toList();
+      QStringList shuffled_album_keys = album_key_set.values();
       std::random_shuffle(shuffled_album_keys.begin(), shuffled_album_keys.end());
 
       // If the user is currently playing a song, force its album to be first
diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index a9dbec189..0b4836fc9 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -558,7 +558,7 @@ QString PlaylistManager::GetNameForNewPlaylist(const SongList &songs) {
   }
 
   if (!various_artists && albums.size() == 1) {
-    result += " - " + albums.toList().first();
+    result += " - " + albums.values().first();
   }
 
   return result;