diff --git a/plugins/samplesource/gnuradio/gnuradiogui.cpp b/plugins/samplesource/gnuradio/gnuradiogui.cpp
index 3291aa4..c9d3bbb 100644
--- a/plugins/samplesource/gnuradio/gnuradiogui.cpp
+++ b/plugins/samplesource/gnuradio/gnuradiogui.cpp
@@ -106,7 +106,7 @@ bool GNURadioGui::deserialize(const QByteArray& data)
 
 bool GNURadioGui::handleMessage(Message* message)
 {
-	if(message->id() == GNURadioInput::MsgReportGNURadio::ID()) {
+	if(GNURadioInput::MsgReportGNURadio::match(message)) {
 		GNURadioInput::MsgReportGNURadio* rep = (GNURadioInput::MsgReportGNURadio*)message;
 		m_namedGains = rep->getNamedGains();
 		m_freqMin = rep->getFreqMin();
diff --git a/plugins/samplesource/gnuradio/gnuradioinput.cpp b/plugins/samplesource/gnuradio/gnuradioinput.cpp
index b564822..f3999e1 100644
--- a/plugins/samplesource/gnuradio/gnuradioinput.cpp
+++ b/plugins/samplesource/gnuradio/gnuradioinput.cpp
@@ -23,8 +23,8 @@
 #include "gnuradiothread.h"
 #include "gnuradiogui.h"
 
-MessageRegistrator GNURadioInput::MsgConfigureGNURadio::ID("MsgConfigureGNURadio");
-MessageRegistrator GNURadioInput::MsgReportGNURadio::ID("MsgReportGNURadio");
+MESSAGE_CLASS_DEFINITION(GNURadioInput::MsgConfigureGNURadio, Message)
+MESSAGE_CLASS_DEFINITION(GNURadioInput::MsgReportGNURadio, Message)
 
 GNURadioInput::Settings::Settings() :
 	m_args(""),
@@ -135,7 +135,7 @@ bool GNURadioInput::startInput(int device)
 			freqMin = freq_rage.start();
 			freqMax = freq_rage.stop();
 		} catch ( std::exception &ex ) {
-			qDebug(ex.what());
+			qDebug("%s", ex.what());
 		}
 
 		freqCorr = radio->get_freq_corr();
@@ -160,14 +160,14 @@ bool GNURadioInput::startInput(int device)
 
 				m_settings.m_namedGains.push_back( pair2 );
 			} catch ( std::exception &ex ) {
-				qDebug(ex.what());
+				qDebug("%s", ex.what());
 			}
 		}
 
 		try {
 			sampRates = radio->get_sample_rates().values();
 		} catch ( std::exception &ex ) {
-			qDebug(ex.what());
+			qDebug("%s", ex.what());
 		}
 
 		antennas.clear();
@@ -188,7 +188,7 @@ bool GNURadioInput::startInput(int device)
 		try {
 			bandwidths = radio->get_bandwidth_range().values();
 		} catch ( std::exception &ex ) {
-			qDebug(ex.what());
+			qDebug("%s", ex.what());
 		}
 	}
 
@@ -235,7 +235,7 @@ quint64 GNURadioInput::getCenterFrequency() const
 
 bool GNURadioInput::handleMessage(Message* message)
 {
-	if(message->id() == MsgConfigureGNURadio::ID()) {
+	if(MsgConfigureGNURadio::match(message)) {
 		MsgConfigureGNURadio* conf = (MsgConfigureGNURadio*)message;
 		if(!applySettings(conf->getGeneralSettings(), conf->getSettings(), false))
 			qDebug("Gnuradio config error");
@@ -324,7 +324,7 @@ bool GNURadioInput::applySettings(const GeneralSettings& generalSettings,
 		}
 
 	} catch ( std::exception &ex ) {
-		qDebug(ex.what());
+		qDebug("%s", ex.what());
 		return false;
 	}
 
diff --git a/plugins/samplesource/gnuradio/gnuradioinput.h b/plugins/samplesource/gnuradio/gnuradioinput.h
index 78a4298..de2da43 100644
--- a/plugins/samplesource/gnuradio/gnuradioinput.h
+++ b/plugins/samplesource/gnuradio/gnuradioinput.h
@@ -46,9 +46,9 @@ public:
 	};
 
 	class MsgConfigureGNURadio : public Message {
-	public:
-		static MessageRegistrator ID;
+		MESSAGE_CLASS_DECLARATION
 
+	public:
 		const GeneralSettings& getGeneralSettings() const { return m_generalSettings; }
 		const Settings& getSettings() const { return m_settings; }
 
@@ -62,16 +62,16 @@ public:
 		Settings m_settings;
 
 		MsgConfigureGNURadio(const GeneralSettings& generalSettings, const Settings& settings) :
-			Message(ID()),
+			Message(),
 			m_generalSettings(generalSettings),
 			m_settings(settings)
 		{ }
 	};
 
 	class MsgReportGNURadio : public Message {
-	public:
-		static MessageRegistrator ID;
+		MESSAGE_CLASS_DECLARATION
 
+	public:
 		const std::vector< std::pair< QString, std::vector<double> > >& getNamedGains() const { return m_namedGains; }
 		const double getFreqMin() const { return m_freqMin; }
 		const double getFreqMax() const { return m_freqMax; }
@@ -115,7 +115,7 @@ public:
 				  const std::vector<QString>& dcoffs,
 				  const std::vector<QString>& iqbals,
 				  const std::vector<double>& bandwidths) :
-			Message(ID()),
+			Message(),
 			m_freqMin(freqMin),
 			m_freqMax(freqMax),
 			m_freqCorr(freqCorr),