diff --git a/bin/cqlsh b/bin/cqlsh
index f731bb474c..d17d1a0a7e 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -482,7 +482,7 @@ def auto_format_udts():
     make_udt_class = cassandra.cqltypes.UserType.make_udt_class
     def new_make_udt_class(cls, *args, **kwargs):
         udt_class = make_udt_class(*args, **kwargs)
-        formatter_for(udt_class.typename)(format_value_utype)
+        formatter_for(udt_class.tuple_type.__name__)(format_value_utype)
         return udt_class
 
     cassandra.cqltypes.UserType.make_udt_class = classmethod(new_make_udt_class)
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 850fd90d27..2891e9a9ec 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1381,8 +1381,7 @@ public class DatabaseDescriptor
 
     public static int getSSTablePreempiveOpenIntervalInMB()
     {
-        //return conf.sstable_preemptive_open_interval_in_mb;
-        return -1;
+        return conf.sstable_preemptive_open_interval_in_mb;
     }
 
     public static boolean getTrickleFsync()