diff --git a/CHANGES.txt b/CHANGES.txt
index c41659415c..ac081481b6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -79,8 +79,7 @@
  * fixes for cache save/load (CASSANDRA-2172, -2174)
  * Handle whole-row deletions in CFOutputFormat (CASSANDRA-2014)
  * Make memtable_flush_writers flush in parallel (CASSANDRA-2178)
- * make key cache preheating default to false; enable with
-   -Dcompaction_preheat_key_cache=true (CASSANDRA-2175)
+ * Add compaction_preheat_key_cache option (CASSANDRA-2175)
  * refactor stress.py to have only one copy of the format string 
    used for creating row keys (CASSANDRA-2108)
  * validate index names for \w+ (CASSANDRA-2196)
diff --git a/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java b/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java
index 6025622817..da59438022 100644
--- a/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java
+++ b/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java
@@ -119,6 +119,12 @@ public class Session
         {
             CommandLine cmd = parser.parse(availableOptions, arguments);
 
+            if (cmd.getArgs().length > 0)
+            {
+                System.err.println("Application does not allow arbitrary arguments: " + StringUtils.join(cmd.getArgList(), ", "));
+                System.exit(1);
+            }
+
             if (cmd.hasOption("h"))
                 throw new IllegalArgumentException("help");
 
diff --git a/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java b/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java
index d80b145dae..fc0352ee53 100644
--- a/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java
@@ -80,11 +80,12 @@ public class DropColumnFamily extends Migration
 
         if (!clientMode)
         {
+            cfs.snapshot(Table.getTimestampedSnapshotName(null));
+
             CompactionManager.instance.getCompactionLock().lock();
             cfs.flushLock.lock();
             try
             {
-                cfs.snapshot(Table.getTimestampedSnapshotName(null));
                 Table.open(ksm.name).dropCf(cfm.cfId);
             }
             finally
diff --git a/src/java/org/apache/cassandra/db/migration/DropKeyspace.java b/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
index 1fefbdaf4d..cdfcc231d3 100644
--- a/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
+++ b/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
@@ -63,10 +63,10 @@ public class DropKeyspace extends Migration
                 CFMetaData.purge(cfm);
                 if (!clientMode)
                 {
+                    cfs.snapshot(snapshotName);
                     cfs.flushLock.lock();
                     try
                     {
-                        cfs.snapshot(snapshotName);
                         Table.open(ksm.name).dropCf(cfm.cfId);
                     }
                     finally
diff --git a/test/unit/org/apache/cassandra/db/DefsTest.java b/test/unit/org/apache/cassandra/db/DefsTest.java
index ea9dd53f05..0461a9502b 100644
--- a/test/unit/org/apache/cassandra/db/DefsTest.java
+++ b/test/unit/org/apache/cassandra/db/DefsTest.java
@@ -430,7 +430,7 @@ public class DefsTest extends CleanupHelper
         assert ks != null;
         final CFMetaData cfm = ks.cfMetaData().get("Standard2");
         assert cfm != null;
-        
+
         // write some data, force a flush, then verify that files exist on disk.
         RowMutation rm = new RowMutation(ks.name, dk.key);
         for (int i = 0; i < 100; i++)
@@ -471,7 +471,28 @@ public class DefsTest extends CleanupHelper
         }
         assert threw;
     }
-    
+
+    @Test
+    public void dropKSUnflushed() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        DecoratedKey dk = Util.dk("dropKs");
+        // sanity
+        final KSMetaData ks = DatabaseDescriptor.getTableDefinition("Keyspace3");
+        assert ks != null;
+        final CFMetaData cfm = ks.cfMetaData().get("Standard1");
+        assert cfm != null;
+
+        // write some data
+        RowMutation rm = new RowMutation(ks.name, dk.key);
+        for (int i = 0; i < 100; i++)
+            rm.add(new QueryPath(cfm.cfName, null, ByteBufferUtil.bytes(("col" + i))), ByteBufferUtil.bytes("anyvalue"), 1L);
+        rm.apply();
+
+        new DropKeyspace(ks.name).apply();
+
+        assert DatabaseDescriptor.getTableDefinition(ks.name) == null;
+    }
+
     @Test
     public void renameKs() throws ConfigurationException, IOException, ExecutionException, InterruptedException
     {