diff --git a/plugins/itemsync/tests/itemsynctests.cpp b/plugins/itemsync/tests/itemsynctests.cpp
index 7406b04c37a507731c0606f2a07101e57e79d160..2fb2d9ee98b6e6d085f7b9c30df1013249abb332 100644
--- a/plugins/itemsync/tests/itemsynctests.cpp
+++ b/plugins/itemsync/tests/itemsynctests.cpp
@@ -502,9 +502,14 @@ void ItemSyncTests::notes()
 
     // One new file for notes.
     const QStringList files2 = dir1.files();
-    const QSet<QString> filesDiff = files2.toSet() - files1.toSet();
-    QCOMPARE( filesDiff.size(), 1 );
-    const QString fileNote = *filesDiff.begin();
+    QCOMPARE( files2.size(), files1.size() + 1 );
+    QString fileNote;
+    for (const auto &file : files2) {
+        if ( !files1.contains(file) ) {
+            fileNote = file;
+            break;
+        }
+    }
 
     // Read file with the notes.
     FilePtr file = dir1.file(fileNote);
diff --git a/src/gui/clipboardbrowser.cpp b/src/gui/clipboardbrowser.cpp
index 174e8477080a81c7fde3f624be6f12c515b6e8b0..d42baceeabe4f626e59badabb36e0221684e5247 100644
--- a/src/gui/clipboardbrowser.cpp
+++ b/src/gui/clipboardbrowser.cpp
@@ -1650,15 +1650,13 @@ void ClipboardBrowser::addUnique(const QVariantMap &data, ClipboardMode mode)
             const auto oldText = getTextData(previousData);
             if ( (mode == ClipboardMode::Clipboard)
                  ? (newText == oldText)
-                 : getTextData(data).contains(getTextData(previousData)) )
+                 : newText.contains(oldText) )
             {
                 COPYQ_LOG("New item: Merging with top item");
 
-                const QSet<QString> formatsToAdd = previousData.keys().toSet() - data.keys().toSet();
-
-                auto newData = data;
-                for (const auto &format : formatsToAdd)
-                    newData.insert(format, previousData[format]);
+                auto newData = previousData;
+                for (auto it = data.constBegin(); it != data.constEnd(); ++it)
+                    newData.insert(it.key(), it.value());
 
                 m.setData(firstIndex, newData, contentType::data);
 
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 649dd3af809fc77c023073d9d516c94c6ee86208..4959e01da837612eccc8ab85f8a3c4ccb9c4c65d 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -2679,7 +2679,6 @@ void MainWindow::tabsMoved(const QString &oldPrefix, const QString &newPrefix)
     const QStringList tabs = ui->tabWidget->tabs();
     Q_ASSERT( oldPrefix == newPrefix || !tabs.contains(oldPrefix) );
     Q_ASSERT( !tabs.contains(QString()) );
-    Q_ASSERT( tabs.toSet().size() == tabs.size() );
 
     const QString prefix = oldPrefix + '/';