diff --git a/src/comm/OpalLink.cc b/src/comm/OpalLink.cc
index fbc7cba828e5448df001c5f9e51fe510409fffc5..b3a467c5fb48d8f1aa5a550d2da3a655bd73302a 100644
--- a/src/comm/OpalLink.cc
+++ b/src/comm/OpalLink.cc
@@ -143,7 +143,7 @@ void OpalLink::writeBytes(const char *bytes, qint64 length)
 //        	this->sendRCValues = static_cast<bool>(rc.enabled);
 //        }
 //        break;
-#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES
+#ifdef MAVLINK_ENABLED_UALBERTA
         case MAVLINK_MSG_ID_RADIO_CALIBRATION:
         {
             mavlink_radio_calibration_t radio;
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 4d0e79d23506959fc5a4c038250600a130abf1cb..0ad9e8cfa512978bdce54ef0471d0489cf23c7ff 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -1200,7 +1200,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
         mavlink_message_t message;
         mavlink_msg_manual_control_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID, &message, this->uasId, (float)manualRollAngle, (float)manualPitchAngle, (float)manualYawAngle, (float)manualThrust, controlRollManual, controlPitchManual, controlYawManual, controlThrustManual);
         sendMessage(message);
-        qDebug() << __FILE__ << __LINE__ << ": SENT MANUAL CONTROL MESSAGE: roll" << manualRollAngle << " pitch: " << manualPitchAngle << " yaw: " << manualYawAngle << " thrust: " << manualThrust;
+        //qDebug() << __FILE__ << __LINE__ << ": SENT MANUAL CONTROL MESSAGE: roll" << manualRollAngle << " pitch: " << manualPitchAngle << " yaw: " << manualYawAngle << " thrust: " << manualThrust;
 
         emit attitudeThrustSetPointChanged(this, roll, pitch, yaw, thrust, MG::TIME::getGroundTimeNow());
       #endif
diff --git a/src/ui/RadioCalibration/RadioCalibrationWindow.cc b/src/ui/RadioCalibration/RadioCalibrationWindow.cc
index effb3b52ea7013457bf32c3974ab238169c85cc7..e6c483dccca4c2e45907f0c9bced233367bbb69c 100644
--- a/src/ui/RadioCalibration/RadioCalibrationWindow.cc
+++ b/src/ui/RadioCalibration/RadioCalibrationWindow.cc
@@ -265,7 +265,7 @@ void RadioCalibrationWindow::parseSetpoint(const QDomElement &setpoint, const QP
 void RadioCalibrationWindow::send()
 {
     qDebug() << __FILE__ << __LINE__ << "uasId = " << uasId;
-#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES
+#ifdef MAVLINK_ENABLED_UALBERTA
     UAS *uas = dynamic_cast<UAS*>(UASManager::instance()->getUASForId(uasId));
     if (uas)
     {