diff --git a/plugins/samplesource/testsource/testsourceinput.cpp b/plugins/samplesource/testsource/testsourceinput.cpp
index eda87732f..c73a7878d 100644
--- a/plugins/samplesource/testsource/testsourceinput.cpp
+++ b/plugins/samplesource/testsource/testsourceinput.cpp
@@ -175,7 +175,7 @@ bool TestSourceInput::handleMessage(const Message& message)
     else if (MsgFileRecord::match(message))
     {
         MsgFileRecord& conf = (MsgFileRecord&) message;
-        qDebug() << "RTLSDRInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
+        qDebug() << "TestSourceInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
 
         if (conf.getStartStop())
         {
@@ -197,7 +197,7 @@ bool TestSourceInput::handleMessage(const Message& message)
     else if (MsgStartStop::match(message))
     {
         MsgStartStop& cmd = (MsgStartStop&) message;
-        qDebug() << "RTLSDRInput::handleMessage: MsgStartStop: " << (cmd.getStartStop() ? "start" : "stop");
+        qDebug() << "TestSourceInput::handleMessage: MsgStartStop: " << (cmd.getStartStop() ? "start" : "stop");
 
         if (cmd.getStartStop())
         {
diff --git a/sdrdaemon/channel/sdrdaemonchannelsink.cpp b/sdrdaemon/channel/sdrdaemonchannelsink.cpp
index 149817708..9a656db67 100644
--- a/sdrdaemon/channel/sdrdaemonchannelsink.cpp
+++ b/sdrdaemon/channel/sdrdaemonchannelsink.cpp
@@ -47,7 +47,7 @@ SDRDaemonChannelSink::SDRDaemonChannelSink(DeviceSourceAPI *deviceAPI) :
         m_dataBlock(0),
         m_centerFrequency(0),
         m_sampleRate(48000),
-        m_sampleBytes(SDR_RX_SAMP_SZ/8),
+        m_sampleBytes(SDR_RX_SAMP_SZ == 24 ? 4 : 2),
         m_nbBlocksFEC(0),
         m_txDelay(100)
 {
@@ -128,7 +128,7 @@ void SDRDaemonChannelSink::feed(const SampleVector::const_iterator& begin, const
                 qDebug() << "SDRDaemonChannelSink::feed: meta: "
                         << "|" << metaData.m_centerFrequency
                         << ":" << metaData.m_sampleRate
-                        << ":" << (int) (metaData.m_sampleBytes & 0xF)
+                        << ":" << (int) metaData.m_sampleBytes
                         << ":" << (int) metaData.m_sampleBits
                         << "|" << (int) metaData.m_nbOriginalBlocks
                         << ":" << (int) metaData.m_nbFECBlocks
diff --git a/sdrdaemon/channel/sdrdaemonchannelsink.h b/sdrdaemon/channel/sdrdaemonchannelsink.h
index 7e617cca1..810954cbb 100644
--- a/sdrdaemon/channel/sdrdaemonchannelsink.h
+++ b/sdrdaemon/channel/sdrdaemonchannelsink.h
@@ -62,7 +62,6 @@ public:
     /** Set sample rate given in Hz */
     void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; }
 
-    void setSampleBytes(uint8_t sampleBytes) { m_sampleBytes = sampleBytes; }
     void setNbBlocksFEC(int nbBlocksFEC);
     void setTxDelay(int txDelay);