diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc
index 71efcfe33a742bbc593336dd8931432732226cfb..5e7a6df3b4b3ce68255753022be81be4c315d8e8 100644
--- a/src/comm/SerialLink.cc
+++ b/src/comm/SerialLink.cc
@@ -89,7 +89,8 @@ SerialLink::SerialLink(QString portname, BaudRateType baudrate, FlowType flow, P
     }
 #else
     // *nix (Linux, MacOS tested) serial port support
-    port = new QextSerialPort(porthandle, QextSerialPort::Polling);
+    //port = new QextSerialPort(porthandle, QextSerialPort::Polling);
+    port = new QextSerialPort(porthandle, QextSerialPort::EventDriven);
     port->setTimeout(timeout); // Timeout of 0 ms, we don't want to wait for data, we just poll again next time
     port->setBaudRate(baudrate);
     port->setFlowControl(flow);
diff --git a/src/ui/SlugsDataSensorView.cc b/src/ui/SlugsDataSensorView.cc
index 5aed013188f71a37f2c630418e57a6e934c55677..fae39cc0cb9a00da4f7bb1c9c3890f7f3d9786fc 100644
--- a/src/ui/SlugsDataSensorView.cc
+++ b/src/ui/SlugsDataSensorView.cc
@@ -34,9 +34,9 @@ void SlugsDataSensorView::addUAS(UASInterface* uas)
 
         //connect standar messages
     connect(slugsMav, SIGNAL(localPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(slugLocalPositionChanged(UASInterface*,double,double,double,quint64)));
-        connect(slugsMav, SIGNAL(speedChanged(UASInterface*,double,double,double,quint64)), this, SLOT(slugSpeedLocalPositionChanged(UASInterface*,double,double,double,quint64)));
-        connect(slugsMav, SIGNAL(attitudeChanged(UASInterface*,double,double,double,quint64)), this, SLOT(slugAttitudeChanged(UASInterface*,double,double,double,quint64)));
-        connect(slugsMav, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(slugsGlobalPositionChanged(UASInterface*,double,double,double,quint64)));
+    connect(slugsMav, SIGNAL(speedChanged(UASInterface*,double,double,double,quint64)), this, SLOT(slugSpeedLocalPositionChanged(UASInterface*,double,double,double,quint64)));
+    connect(slugsMav, SIGNAL(attitudeChanged(UASInterface*,double,double,double,quint64)), this, SLOT(slugAttitudeChanged(UASInterface*,double,double,double,quint64)));
+    connect(slugsMav, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(slugsGlobalPositionChanged(UASInterface*,double,double,double,quint64)));