diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc
index b992633a428f3982fe0eda1b1b92dfff2a25a4c3..d6aea1f3e136820f5a5afdc6a7fb0f5dec479191 100644
--- a/src/comm/MAVLinkProtocol.cc
+++ b/src/comm/MAVLinkProtocol.cc
@@ -229,6 +229,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
                 }
                 else
                 {
+                    // TODO: This if-else block can (should) be greatly simplified
                     if (lastIndex[message.sysid][message.compid] == 255)
                     {
                         lastIndex[message.sysid][message.compid] = 0;
diff --git a/src/ui/SlugsDataSensorView.cc b/src/ui/SlugsDataSensorView.cc
index 79d97e9d445742e31c3495311681e66a5ee2be38..f975cc0b142fadc74cc394058b0a4885eb34633f 100644
--- a/src/ui/SlugsDataSensorView.cc
+++ b/src/ui/SlugsDataSensorView.cc
@@ -28,7 +28,7 @@ SlugsDataSensorView::~SlugsDataSensorView()
 
 void SlugsDataSensorView::addUAS(UASInterface* uas)
 {
-    SlugsMAV* slugsMav = dynamic_cast<SlugsMAV*>(uas);
+    SlugsMAV* slugsMav = qobject_cast<SlugsMAV*>(uas);
 
   if (slugsMav != NULL) {