diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc
index 17038a6..99710b6 100644
--- a/lib/hackrf/hackrf_sink_c.cc
+++ b/lib/hackrf/hackrf_sink_c.cc
@@ -204,7 +204,7 @@ hackrf_sink_c::hackrf_sink_c (const std::string &args)
               << std::endl;
   }
 
-  set_sample_rate( 5000000 );
+  set_sample_rate( get_sample_rates().start() );
 
   set_gain( 0 ); /* disable AMP gain stage by default */
 
@@ -463,7 +463,7 @@ osmosdr::meta_range_t hackrf_sink_c::get_sample_rates()
 {
   osmosdr::meta_range_t range;
 
-  range += osmosdr::range_t( 5e6 ); /* out of spec but appears to work */
+  range += osmosdr::range_t( 8e6 );
   range += osmosdr::range_t( 10e6 );
   range += osmosdr::range_t( 12.5e6 );
   range += osmosdr::range_t( 16e6 );
@@ -634,7 +634,7 @@ double hackrf_sink_c::set_if_gain( double gain, size_t chan )
   if (_dev) {
     double clip_gain = if_gains.clip( gain, true );
 
-    if ( hackrf_set_txvga_gain( _dev, uint32_t(value) ) == HACKRF_SUCCESS )
+    if ( hackrf_set_txvga_gain( _dev, uint32_t(clip_gain) ) == HACKRF_SUCCESS )
     _vga_gain = clip_gain;
   }
 
diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc
index 2eeaa9b..97cefcc 100644
--- a/lib/hackrf/hackrf_source_c.cc
+++ b/lib/hackrf/hackrf_source_c.cc
@@ -157,7 +157,7 @@ hackrf_source_c::hackrf_source_c (const std::string &args)
               << std::endl;
   }
 
-  set_sample_rate( 5000000 );
+  set_sample_rate( get_sample_rates().start() );
 
   set_gain( 0 ); /* disable AMP gain stage by default */
 
@@ -354,7 +354,7 @@ osmosdr::meta_range_t hackrf_source_c::get_sample_rates()
 {
   osmosdr::meta_range_t range;
 
-  range += osmosdr::range_t( 5e6 ); /* out of spec but appears to work */
+  range += osmosdr::range_t( 8e6 );
   range += osmosdr::range_t( 10e6 );
   range += osmosdr::range_t( 12.5e6 );
   range += osmosdr::range_t( 16e6 );