diff --git a/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp b/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp
index e879b6822e..b08e13ab6d 100644
--- a/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp
@@ -262,7 +262,7 @@ void ADSBDemodSinkWorker::run()
                         if (m_sink->getMessageQueueToGUI() && ((df == 4) || (df == 5) || (df == 20) || (df == 21)))
                         {
                             ADSBDemodReport::MsgReportADSB *msg = ADSBDemodReport::MsgReportADSB::create(
-                                QByteArray((char*)data, sizeof(data)),
+                                QByteArray((char*)data, bytes),
                                 preambleCorrelation * m_correlationScale,
                                 preambleCorrelationOnes / samplesPerChip,
                                 rxDateTime(firstIdx, readBuffer),
@@ -273,7 +273,7 @@ void ADSBDemodSinkWorker::run()
                         if (m_sink->getMessageQueueToWorker())
                         {
                             ADSBDemodReport::MsgReportADSB *msg = ADSBDemodReport::MsgReportADSB::create(
-                                QByteArray((char*)data, sizeof(data)),
+                                QByteArray((char*)data, bytes),
                                 preambleCorrelation * m_correlationScale,
                                 preambleCorrelationOnes / samplesPerChip,
                                 rxDateTime(firstIdx, readBuffer),
diff --git a/plugins/channeltx/modwfm/wfmmodbaseband.cpp b/plugins/channeltx/modwfm/wfmmodbaseband.cpp
index 5ac75bd294..c8019d6f19 100644
--- a/plugins/channeltx/modwfm/wfmmodbaseband.cpp
+++ b/plugins/channeltx/modwfm/wfmmodbaseband.cpp
@@ -48,6 +48,7 @@ WFMModBaseband::WFMModBaseband()
 
 WFMModBaseband::~WFMModBaseband()
 {
+    DSPEngine::instance()->getAudioDeviceManager()->removeAudioSink(m_source.getFeedbackAudioFifo());
     DSPEngine::instance()->getAudioDeviceManager()->removeAudioSource(m_source.getAudioFifo());
     delete m_channelizer;
 }