diff --git a/src/track/keyfactory.cpp b/src/track/keyfactory.cpp
index b6c24b5e2efe..389bee4ab5d5 100644
--- a/src/track/keyfactory.cpp
+++ b/src/track/keyfactory.cpp
@@ -89,7 +89,7 @@ Keys KeyFactory::makePreferredKeys(
 
     if (version == KEY_MAP_VERSION) {
         KeyMap key_map;
-        for (const auto* it = key_changes.constBegin();
+        for (auto it = key_changes.constBegin();
                 it != key_changes.constEnd();
                 ++it) {
             // Key position is in frames. Do not accept fractional frames.
diff --git a/src/track/keys.h b/src/track/keys.h
index 7e286c0d49fb..5e593c8e8ca1 100644
--- a/src/track/keys.h
+++ b/src/track/keys.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include <QByteArray>
+#include <QList>
 #include <QPair>
-#include <QVector>
 
 #include "proto/keys.pb.h"
 
 #define KEY_MAP_VERSION "KeyMap-1.0"
 
-typedef QVector<QPair<mixxx::track::io::key::ChromaticKey, double> > KeyChangeList;
+typedef QList<QPair<mixxx::track::io::key::ChromaticKey, double> > KeyChangeList;
 
 class KeyFactory;