diff --git a/plugins/channel/am/amdemod.cpp b/plugins/channel/am/amdemod.cpp
index 802cce7a8..8ee018f38 100644
--- a/plugins/channel/am/amdemod.cpp
+++ b/plugins/channel/am/amdemod.cpp
@@ -231,7 +231,7 @@ void AMDemod::apply()
 		(m_config.m_rfBandwidth != m_running.m_rfBandwidth)) {
 		m_interpolator.create(16, m_config.m_inputSampleRate, m_config.m_rfBandwidth / 2.2);
 		m_interpolatorDistanceRemain = 0;
-		m_interpolatorDistance =  m_config.m_inputSampleRate / m_config.m_audioSampleRate;
+		m_interpolatorDistance = (Real) m_config.m_inputSampleRate / (Real) m_config.m_audioSampleRate;
 	}
 
 	if((m_config.m_afBandwidth != m_running.m_afBandwidth) ||
diff --git a/plugins/channel/wfm/wfmdemod.cpp b/plugins/channel/wfm/wfmdemod.cpp
index 0961d4769..ab96c25ab 100644
--- a/plugins/channel/wfm/wfmdemod.cpp
+++ b/plugins/channel/wfm/wfmdemod.cpp
@@ -286,7 +286,7 @@ void WFMDemod::apply()
 	{
 		m_interpolator.create(16, m_config.m_inputSampleRate, m_config.m_afBandwidth);
 		m_interpolatorDistanceRemain = (Real) m_config.m_inputSampleRate / m_config.m_audioSampleRate;
-		m_interpolatorDistance =  m_config.m_inputSampleRate / m_config.m_audioSampleRate;
+		m_interpolatorDistance =  (Real) m_config.m_inputSampleRate / (Real) m_config.m_audioSampleRate;
 	}
 
 	if((m_config.m_inputSampleRate != m_running.m_inputSampleRate) ||
diff --git a/plugins/samplesource/bladerf/bladerfgui.cpp b/plugins/samplesource/bladerf/bladerfgui.cpp
index 947ccf741..0a55b17d1 100644
--- a/plugins/samplesource/bladerf/bladerfgui.cpp
+++ b/plugins/samplesource/bladerf/bladerfgui.cpp
@@ -259,6 +259,15 @@ void BladerfGui::on_xb200_currentIndexChanged(int index)
 		m_settings.m_xb200 = false;
 	}
 
+	if (m_settings.m_xb200)
+	{
+		ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000);
+	}
+	else
+	{
+		ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000);
+	}
+
 	sendSettings();
 }
 
@@ -315,8 +324,8 @@ unsigned int BladerfGui::getXb200Index(bool xb_200, bladerf_xb200_path xb200Path
 	}
 }
 
-unsigned int BladerfSampleRates::m_rates[] = {384, 768, 1536, 2304, 3072, 6144, 12288, 24576, 30720, 39936};
-unsigned int BladerfSampleRates::m_nb_rates = 10;
+unsigned int BladerfSampleRates::m_rates[] = {384, 768, 1536, 2304, 3072, 4608, 6144, 9216, 12288, 18432, 24576, 30720, 36864, 39936};
+unsigned int BladerfSampleRates::m_nb_rates = 14;
 
 unsigned int BladerfSampleRates::getRate(unsigned int rate_index)
 {
diff --git a/plugins/samplesource/bladerf/bladerfgui.h b/plugins/samplesource/bladerf/bladerfgui.h
index 500e060c5..402dc880a 100644
--- a/plugins/samplesource/bladerf/bladerfgui.h
+++ b/plugins/samplesource/bladerf/bladerfgui.h
@@ -79,7 +79,7 @@ public:
 	static unsigned int getRate(unsigned int rate_index);
 	static unsigned int getRateIndex(unsigned int rate);
 private:
-	static unsigned int m_rates[10];
+	static unsigned int m_rates[14];
 	static unsigned int m_nb_rates;
 };
 
diff --git a/plugins/samplesource/bladerf/bladerfgui.ui b/plugins/samplesource/bladerf/bladerfgui.ui
index 28198811c..07bff271f 100644
--- a/plugins/samplesource/bladerf/bladerfgui.ui
+++ b/plugins/samplesource/bladerf/bladerfgui.ui
@@ -201,7 +201,7 @@
         <string>Device Samplerate</string>
        </property>
        <property name="maximum">
-        <number>9</number>
+        <number>13</number>
        </property>
        <property name="pageStep">
         <number>1</number>