diff --git a/src/blackcore/afv/audio/input.h b/src/blackcore/afv/audio/input.h
index 4cf0020ec..228830d33 100644
--- a/src/blackcore/afv/audio/input.h
+++ b/src/blackcore/afv/audio/input.h
@@ -35,7 +35,10 @@ namespace BlackCore
                 //! Inout buffer
                 CAudioInputBuffer(QObject *parent = nullptr);
 
+                //! Start
                 void start();
+
+                //! Stop
                 void stop();
 
                 //! \copydoc QIODevice::readData
@@ -49,6 +52,7 @@ namespace BlackCore
                 void frameAvailable(const QByteArray &frame);
 
             protected:
+                //! \copydoc QIODevice::timerEvent
                 void timerEvent(QTimerEvent *event) override;
 
             private:
@@ -92,7 +96,10 @@ namespace BlackCore
                 void stop();
 
             signals:
+                //! Volume stream data
                 void inputVolumeStream(const InputVolumeStreamArgs &args);
+
+                //! OPUS data
                 void opusDataAvailable(const OpusDataAvailableArgs &args);
 
             private:
diff --git a/src/blackcore/afv/audio/soundcardsampleprovider.cpp b/src/blackcore/afv/audio/soundcardsampleprovider.cpp
index 5bdd02e32..dfa289613 100644
--- a/src/blackcore/afv/audio/soundcardsampleprovider.cpp
+++ b/src/blackcore/afv/audio/soundcardsampleprovider.cpp
@@ -160,7 +160,7 @@ namespace BlackCore
 
                     if (it)
                     {
-                        (*it)->setFrequency(radioTransceiver.frequency);
+                        (*it)->setFrequency(radioTransceiver.frequencyHz);
                     }
                 }
 
diff --git a/src/blackcore/afv/dto.h b/src/blackcore/afv/dto.h
index dc33e819f..444aaca39 100644
--- a/src/blackcore/afv/dto.h
+++ b/src/blackcore/afv/dto.h
@@ -122,20 +122,20 @@ namespace BlackCore
         {
             //! Properties @{
             quint16 id;
-            quint32 frequency;
+            quint32 frequencyHz;
             double LatDeg = 0.0;
             double LonDeg = 0.0;
             double HeightMslM = 0.0;
             double HeightAglM = 0.0;
             //! @}
-            MSGPACK_DEFINE(id, frequency, LatDeg, LonDeg, HeightMslM, HeightAglM)
+            MSGPACK_DEFINE(id, frequencyHz, LatDeg, LonDeg, HeightMslM, HeightAglM)
 
             //! To JSON
             QJsonObject toJson() const
             {
                 QJsonObject json;
                 json["ID"] = id;
-                json["Frequency"] = static_cast<int>(frequency);
+                json["Frequency"] = static_cast<int>(frequencyHz);
                 json["LatDeg"] = LatDeg;
                 json["LonDeg"] = LonDeg;
                 json["HeightMslM"] = HeightMslM;
@@ -148,7 +148,7 @@ namespace BlackCore
             {
                 TransceiverDto dto;
                 dto.id = static_cast<quint16>(json.value("id").toInt());
-                dto.frequency = static_cast<quint32>(json.value("frequency").toInt());
+                dto.frequencyHz = static_cast<quint32>(json.value("frequency").toInt());
                 dto.LatDeg = json.value("latDeg").toDouble();
                 dto.LonDeg = json.value("lonDeg").toDouble();
                 dto.HeightMslM = json.value("heightMslM").toDouble();
diff --git a/src/blackcore/afv/model/atcstationmodel.cpp b/src/blackcore/afv/model/atcstationmodel.cpp
index 914cc46d3..2114e2bd6 100644
--- a/src/blackcore/afv/model/atcstationmodel.cpp
+++ b/src/blackcore/afv/model/atcstationmodel.cpp
@@ -34,12 +34,12 @@ namespace BlackCore
 
             quint32 CSampleAtcStation::frequency() const
             {
-                return m_transceiver.frequency;
+                return m_transceiver.frequencyHz;
             }
 
             QString CSampleAtcStation::formattedFrequency() const
             {
-                return QString::number(m_transceiver.frequency / 1000000.0, 'f', 3);
+                return QString::number(m_transceiver.frequencyHz / 1000000.0, 'f', 3);
             }
 
             double CSampleAtcStation::radioDistanceM() const
diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index bab308749..92d360f5f 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -475,7 +475,7 @@ namespace BlackCore
         const CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString,
         const CAircraftMatcherSetup &setup, const CAircraftModelList &modelSet, CAircraftModel::ModelType type, CStatusMessageList *log)
     {
-        Q_UNUSED(setup);
+        Q_UNUSED(setup)
 
         CLivery livery;
         livery.setAirlineIcaoCode(networkAirlineIcao);
diff --git a/src/blackmisc/audio/voicesetup.h b/src/blackmisc/audio/voicesetup.h
index 421ad5221..2dfc69190 100644
--- a/src/blackmisc/audio/voicesetup.h
+++ b/src/blackmisc/audio/voicesetup.h
@@ -25,6 +25,7 @@ namespace BlackMisc
     namespace Audio
     {
         //! Value object for a voice setup
+        //! \deprecated
         class BLACKMISC_EXPORT CVoiceSetup : public CValueObject<CVoiceSetup>
         {
         public:
diff --git a/src/blacksound/sampleprovider/resourcesoundsampleprovider.cpp b/src/blacksound/sampleprovider/resourcesoundsampleprovider.cpp
index ca61c18d3..7d77fcd8b 100644
--- a/src/blacksound/sampleprovider/resourcesoundsampleprovider.cpp
+++ b/src/blacksound/sampleprovider/resourcesoundsampleprovider.cpp
@@ -17,12 +17,12 @@ namespace BlackSound
         {
             if (count > m_tempBufferSize)
             {
-                qDebug() << "Count too large for temp buffer";
+                qDebug() << "Count too large for temp buffer" << count;
                 return 0;
             }
             qint64 availableSamples = m_resourceSound.audioData().size() - m_position;
 
-            qint64 samplesToCopy = qMin(availableSamples, count);
+            const qint64 samplesToCopy = qMin(availableSamples, count);
             samples.clear();
             samples.fill(0, samplesToCopy);