diff --git a/src/rpc/requestrouter_test.cpp b/src/rpc/requestrouter_test.cpp
index 1420d329..5ae2447a 100644
--- a/src/rpc/requestrouter_test.cpp
+++ b/src/rpc/requestrouter_test.cpp
@@ -208,7 +208,7 @@ namespace {
             QCOMPARE(error.has_value(), true);
             if (error.value() == RpcError::TimedOut) {
                 // This is not what we test here but it can happen on some systems
-                QWARN("Connection to port 9 timed out instead of being refused");
+                warning().log("Connection to port 9 timed out instead of being refused");
             } else {
                 QCOMPARE(error.value(), RpcError::ConnectionError);
             }
@@ -467,7 +467,7 @@ namespace {
                 )
             );
             if (!ok) {
-                QWARN("Timed out when waiting for response");
+                warning().log("Timed out when waiting for response");
             }
 
             if (std::holds_alternative<RpcError>(responseOrError)) {
@@ -508,7 +508,7 @@ namespace {
                 )
             );
             if (!ok) {
-                QWARN("Timed out when waiting for response");
+                warning().log("Timed out when waiting for response");
             }
             return responseOrError;
         }
diff --git a/src/ui/savewindowstatedispatcher.cpp b/src/ui/savewindowstatedispatcher.cpp
index dff48958..748f15a1 100644
--- a/src/ui/savewindowstatedispatcher.cpp
+++ b/src/ui/savewindowstatedispatcher.cpp
@@ -73,7 +73,7 @@ namespace tremotesf {
 
     SaveWindowStateHandler::~SaveWindowStateHandler() {
         mWindow->removeEventFilter(this);
-        mWindow->setProperty(windowHasSaveStateHandlerProperty, QVariant::Invalid);
+        mWindow->setProperty(windowHasSaveStateHandlerProperty, QVariant{});
     }
 
     bool SaveWindowStateHandler::eventFilter(QObject* watched, QEvent* event) {