diff --git a/src/http/Service.cpp b/src/http/Service.cpp
index 1a89b732..676bb892 100644
--- a/src/http/Service.cpp
+++ b/src/http/Service.cpp
@@ -29,6 +29,8 @@
 #include "core/Uuid.h"
 #include "core/PasswordGenerator.h"
 
+#include <algorithm>
+
 static const unsigned char KEEPASSHTTP_UUID_DATA[] = {
     0x34, 0x69, 0x7a, 0x40, 0x8a, 0x5b, 0x41, 0xc0,
     0x9f, 0x36, 0x89, 0x7d, 0x62, 0x3e, 0xcb, 0x31
@@ -387,7 +389,7 @@ QList<KeepassHttpProtocol::Entry> Service::findMatchingEntries(const QString& /*
             priorities.insert(entry, sortPriority(entry, host, submitUrl, baseSubmitURL));
 
         //Sort by priorities
-        qSort(pwEntries.begin(), pwEntries.end(), SortEntries(priorities, HttpSettings::sortByTitle() ? "Title" : "UserName"));
+        std::sort(pwEntries.begin(), pwEntries.end(), SortEntries(priorities, HttpSettings::sortByTitle() ? "Title" : "UserName"));
     }
 
     //if (pwEntries.count() > 0)
diff --git a/tests/TestGroupModel.cpp b/tests/TestGroupModel.cpp
index 3608cc47..1faf82aa 100644
--- a/tests/TestGroupModel.cpp
+++ b/tests/TestGroupModel.cpp
@@ -131,7 +131,7 @@ void TestGroupModel::test()
     QCOMPARE(spyMoved.count(), 3);
     QVERIFY(index12.isValid());
     QCOMPARE(model->data(index12).toString(), QString("group12"));
-    QCOMPARE(model->data(index12.child(0, 0)).toString(), QString("group121"));
+    QCOMPARE(model->data(index12.model()->index(0, 0, index12)).toString(), QString("group121"));
 
     delete group12;
     QCOMPARE(spyAboutToAdd.count(), 1);