diff --git a/src/comm/QGCParamID.h b/src/comm/QGCParamID.h
index 4548718..281c7ea 100644
--- a/src/comm/QGCParamID.h
+++ b/src/comm/QGCParamID.h
@@ -2,12 +2,11 @@
 #define QGCPARAMID_H
 
 #include <QString>
-#include <QObject>
+
 namespace OpalRT
 {
-    class QGCParamID : public QString
+    class QGCParamID : protected QString
     {
-        Q_OBJECT
     public:
         QGCParamID();
     };
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 1fe756b..f0c9f08 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -537,7 +537,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit textMessageReceived(uasId, message.compid, severity, text);
             }
             break;
-#ifdef OPAL_RT
+#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES
         case MAVLINK_MSG_ID_NAV_FILTER_BIAS:
             {
                 mavlink_nav_filter_bias_t bias;