diff --git a/usbrly82/integrationpluginusbrly82.cpp b/usbrly82/integrationpluginusbrly82.cpp
index cd7202e3..cb073f49 100644
--- a/usbrly82/integrationpluginusbrly82.cpp
+++ b/usbrly82/integrationpluginusbrly82.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -28,8 +28,9 @@
 *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "plugininfo.h"
 #include "integrationpluginusbrly82.h"
+#include "plugininfo.h"
+#include "usbrly82.h"
 
 IntegrationPluginUsbRly82::IntegrationPluginUsbRly82()
 {
diff --git a/usbrly82/integrationpluginusbrly82.h b/usbrly82/integrationpluginusbrly82.h
index 811c337e..03fc9d9f 100644
--- a/usbrly82/integrationpluginusbrly82.h
+++ b/usbrly82/integrationpluginusbrly82.h
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -31,9 +31,11 @@
 #ifndef INTEGRATIONPLUGINUSBRLY82_H
 #define INTEGRATIONPLUGINUSBRLY82_H
 
-#include "integrations/integrationplugin.h"
+#include <integrations/integrationplugin.h>
+
 #include "serialportmonitor.h"
-#include "usbrly82.h"
+
+class UsbRly82;
 
 class IntegrationPluginUsbRly82: public IntegrationPlugin
 {
diff --git a/usbrly82/serialportmonitor.cpp b/usbrly82/serialportmonitor.cpp
index a69cf318..eb9d95d4 100644
--- a/usbrly82/serialportmonitor.cpp
+++ b/usbrly82/serialportmonitor.cpp
@@ -97,7 +97,6 @@ SerialPortMonitor::SerialPortMonitor(QObject *parent) : QObject(parent)
 
         qCDebug(dcUsbRly82()) << "SerialPortMonitor: [+]" << info;
         m_serialPortInfos.insert(info.systemLocation, info);
-        emit serialPortAdded(info);
     }
 
     udev_enumerate_unref(enumerate);
diff --git a/usbrly82/usbrly82.cpp b/usbrly82/usbrly82.cpp
index a2387e24..656d8efb 100644
--- a/usbrly82/usbrly82.cpp
+++ b/usbrly82/usbrly82.cpp
@@ -192,7 +192,11 @@ bool UsbRly82::connectRelay(const QString &serialPort)
     }
 
     connect(m_serialPort, &QSerialPort::readyRead, this, &UsbRly82::onReadyRead);
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    connect(m_serialPort, &QSerialPort::errorOccurred, this, &UsbRly82::onError, Qt::QueuedConnection);
+#else
     connect(m_serialPort, SIGNAL(error(QSerialPort::SerialPortError)), this, SLOT(onError(QSerialPort::SerialPortError)), Qt::QueuedConnection);
+#endif
 
     // Get serial number
     UsbRly82Reply *reply = getSerialNumber();
@@ -450,7 +454,7 @@ void UsbRly82::updateAnalogInputs()
             return;
         }
 
-        if (m_updateAnalogInputsReply->responseData().count() != 16) {
+        if (m_updateAnalogInputsReply->responseData().length() != 16) {
             qCWarning(dcUsbRly82()) << "Reading analog inputs response returned invalid size" << m_updateAnalogInputsReply->responseData().count() << "(should be 16)";
             m_updateAnalogInputsReply = nullptr;
             return;