diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index a876b36f2..58b3e1f8c 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -624,11 +624,13 @@ void Config::createTempFileInstance()
     if (m_instance) {
         delete m_instance;
     }
-    auto* tmpFile = new QTemporaryFile();
-    bool openResult = tmpFile->open();
-    Q_ASSERT(openResult);
-    Q_UNUSED(openResult);
-    m_instance = new Config(tmpFile->fileName(), "", qApp);
+    auto tmpFileName = QString("%1/%2_settings.XXXXXX").arg(QDir::tempPath(), QCoreApplication::applicationName());
+    auto tmpFile = new QTemporaryFile(tmpFileName);
+    if (!tmpFile->open()) {
+        Q_ASSERT_X(false, __func__, "Failed to create temporary config settings file");
+    }
+    tmpFile->close();
+    m_instance = new Config(tmpFileName, "", qApp);
     tmpFile->setParent(m_instance);
 }
 
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 465df1367..f3c6c8d40 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1426,7 +1426,7 @@ bool DatabaseWidget::syncWithDatabase(const QSharedPointer<Database>& otherDb, Q
 
     if (!changeList.isEmpty()) {
         // Save synced databases
-        if (!m_db->save(Database::Atomic, {}, &error)) {
+        if (!save()) {
             error = tr("Error while saving database %1: %2").arg(m_db->filePath(), error);
             return false;
         }
diff --git a/tests/mock/MockRemoteProcess.cpp b/tests/mock/MockRemoteProcess.cpp
index 4d2ed5806..fe1770932 100644
--- a/tests/mock/MockRemoteProcess.cpp
+++ b/tests/mock/MockRemoteProcess.cpp
@@ -32,6 +32,7 @@ void MockRemoteProcess::start(const QString&)
 
 qint64 MockRemoteProcess::write(const QString& data)
 {
+    m_data.append(data.toUtf8());
     return data.length();
 }
 
@@ -54,3 +55,13 @@ int MockRemoteProcess::exitCode() const
 {
     return 0; // always return success
 }
+
+QString MockRemoteProcess::readOutput()
+{
+    return {};
+}
+
+QString MockRemoteProcess::readError()
+{
+    return {};
+}
diff --git a/tests/mock/MockRemoteProcess.h b/tests/mock/MockRemoteProcess.h
index 95cb6b66b..c39b50cdf 100644
--- a/tests/mock/MockRemoteProcess.h
+++ b/tests/mock/MockRemoteProcess.h
@@ -32,6 +32,8 @@ public:
     void closeWriteChannel() override;
     bool waitForFinished(int msecs) override;
     [[nodiscard]] int exitCode() const override;
+    virtual QString readOutput() override;
+    virtual QString readError() override;
 
 private:
     QByteArray m_data;