diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp
index 6ae7b135a..05454f6de 100644
--- a/src/blackcore/network_vatlib.cpp
+++ b/src/blackcore/network_vatlib.cpp
@@ -525,7 +525,7 @@ namespace BlackCore
                 // if this is really required, I need to group by message
                 // currently I send individual messages
                 QVector<INT> freqsVec;
-                freqsVec.push_back(message.getFrequency().value(CFrequencyUnit::kHz()));
+                freqsVec.push_back(message.getFrequency().valueRounded(CFrequencyUnit::kHz(), 0));
                 m_net->SendRadioTextMessage(freqsVec.size(), freqsVec.data(), toFSD(message.getMessage()));
             }
         }
diff --git a/src/blackgui/textmessagecomponent.cpp b/src/blackgui/textmessagecomponent.cpp
index e892efb82..009d664c9 100644
--- a/src/blackgui/textmessagecomponent.cpp
+++ b/src/blackgui/textmessagecomponent.cpp
@@ -162,10 +162,11 @@ namespace BlackGui
         else
         {
             // frequency message
+            const CAircraft ownAircraft = this->getOwnAircraft();
             if (this->currentWidget() == this->ui->tb_TextMessagesAll) return true;
-            if (textMessage.isSendToFrequency(this->getOwnAircraft().getCom1System().getFrequencyActive()))
+            if (textMessage.isSendToFrequency(ownAircraft.getCom1System().getFrequencyActive()))
                 return this->currentWidget() == this->ui->tb_TextMessagesCOM1;
-            if (textMessage.isSendToFrequency(this->getOwnAircraft().getCom2System().getFrequencyActive()))
+            if (textMessage.isSendToFrequency(ownAircraft.getCom2System().getFrequencyActive()))
                 return this->currentWidget() == this->ui->tb_TextMessagesCOM2;
             return false;
         }
@@ -173,7 +174,7 @@ namespace BlackGui
 
     void CTextMessageComponent::showCurrentFrequenciesFromCockpit()
     {
-        CAircraft ownAircraft = this->getOwnAircraft();
+        const CAircraft ownAircraft = this->getOwnAircraft();
         const QString f1 = QString("COM1: %1").arg(ownAircraft.getCom1System().getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3));
         const QString f2 = QString("COM2: %1").arg(ownAircraft.getCom2System().getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3));
         this->ui->tb_TextMessagesCOM1->setToolTip(f1);
diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp
index 07b2a108c..aade33da8 100644
--- a/src/blackmisc/blackmiscfreefunctions.cpp
+++ b/src/blackmisc/blackmiscfreefunctions.cpp
@@ -55,6 +55,7 @@ void BlackMisc::Aviation::registerMetadata()
     CAircraftList::registerMetadata();
     CAircraftSituation::registerMetadata();
     CAircraftIcao::registerMetadata();
+    CAirportIcao::registerMetadata();
     CSelcal::registerMetadata();
     CFlightPlan::registerMetadata();
 }