diff --git a/src/settings/SettingsManager.java b/src/settings/SettingsManager.java
index ddcc4fa9..2d40e0ad 100644
--- a/src/settings/SettingsManager.java
+++ b/src/settings/SettingsManager.java
@@ -557,11 +557,6 @@ public class SettingsManager
 		ArrayList<TunerConfiguration> configs = getSettings()
 				.getTunerConfigurations( type );
 
-		if( configs.isEmpty() )
-		{
-			configs.add( addNewTunerConfiguration( type, "Default" ) );
-		}
-		
 		return configs;
 	}
 	
diff --git a/src/source/tuner/TunerManager.java b/src/source/tuner/TunerManager.java
index 0668da18..55710259 100644
--- a/src/source/tuner/TunerManager.java
+++ b/src/source/tuner/TunerManager.java
@@ -544,16 +544,14 @@ public class TunerManager
     			}
     		}
     	}
-    	else
-    	{
-    		config = configs.get( 0 );
-    	}
     	
     	//If we're still null at this point, create a default config
     	if( config == null )
     	{
+    		String name = "Default-" + tuner.getUniqueID();
+    		
     		config = mResourceManager.getSettingsManager()
-				.addNewTunerConfiguration( tuner.getTunerType(), "Default" );
+				.addNewTunerConfiguration( tuner.getTunerType(), name );
     	}
     	
     	//Persist the config as the selected tuner configuration.  The method
diff --git a/src/source/tuner/rtl/RTL2832TunerController.java b/src/source/tuner/rtl/RTL2832TunerController.java
index cf8311f0..8729e1a9 100644
--- a/src/source/tuner/rtl/RTL2832TunerController.java
+++ b/src/source/tuner/rtl/RTL2832TunerController.java
@@ -55,8 +55,6 @@ import sample.complex.ComplexBuffer;
 import source.SourceException;
 import source.tuner.TunerController;
 import source.tuner.TunerType;
-import source.tuner.frequency.FrequencyChangeEvent;
-import source.tuner.frequency.FrequencyChangeEvent.Event;
 import buffer.FloatAveragingBuffer;
 import controller.ResourceManager;
 import controller.ThreadPoolManager;
@@ -1486,8 +1484,11 @@ public abstract class RTL2832TunerController extends TunerController
 				buffer.get( data );
 
 				buffer.rewind();
-
-				mFilledBuffers.add( data );
+				
+				if( mRunning.get() )
+				{
+					mFilledBuffers.add( data );
+				}
 				
 				mSampleCounter.addAndGet( transfer.actualLength() );
 				
@@ -1501,11 +1502,19 @@ public abstract class RTL2832TunerController extends TunerController
 			{
 				case LibUsb.TRANSFER_COMPLETED:
 					/* resubmit the transfer */
-					int result = LibUsb.submitTransfer( transfer );
-					
-					if( result != LibUsb.SUCCESS )
+					if( isRunning() )
+					{
+						int result = LibUsb.submitTransfer( transfer );
+						
+						if( result != LibUsb.SUCCESS )
+						{
+							mLog.error( "couldn't resubmit buffer transfer to tuner" );
+							LibUsb.freeTransfer( transfer );
+							mTransfers.remove( transfer );
+						}
+					}
+					else
 					{
-						mLog.error( "couldn't resubmit buffer transfer to tuner" );
 						LibUsb.freeTransfer( transfer );
 						mTransfers.remove( transfer );
 					}
diff --git a/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java b/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java
index acca6fba..8ecc7795 100644
--- a/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java
+++ b/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java
@@ -34,7 +34,7 @@ public class R820TTunerConfiguration extends TunerConfiguration
 	private R820TLNAGain mLNAGain = R820TLNAGain.GAIN_222;
 	private R820TVGAGain mVGAGain = R820TVGAGain.GAIN_210;
 	private double mFrequencyCorrection = 0.0d;
-	private SampleRate mSampleRate = SampleRate.RATE_1_920MHZ;
+	private SampleRate mSampleRate = SampleRate.RATE_2_400MHZ;
 
 	/**
 	 * Default constructor for JAXB