diff --git a/src/runtime.h b/src/runtime.h
index 6f03fe0..1b0c437 100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -63,11 +63,13 @@
 
   // In small mode, apps with fewer than this number of methods will be compiled 
   // anyways.
+  // TODO: come up with a reasonable default.
   static const size_t kDefaultSmallModeMethodThreshold = 0;
 
   // In small mode, methods smaller than this dex op count limit will get compiled
   // anyways.
-  static const size_t kDefaultSmallModeMethodDexSizeLimit = 0;
+  // TODO: come up with a reasonable default.
+  static const size_t kDefaultSmallModeMethodDexSizeLimit = 300;
 
   class ParsedOptions {
    public:
diff --git a/src/thread_list.cc b/src/thread_list.cc
index ebb63dd..eacd848 100644
--- a/src/thread_list.cc
+++ b/src/thread_list.cc
@@ -466,10 +466,8 @@
     all_threads_are_daemons = true;
     MutexLock mu(self, *Locks::thread_list_lock_);
     for (It it = list_.begin(), end = list_.end(); it != end; ++it) {
-      // TODO: there's a race here with thread exit that's being worked around by checking if the
-      // thread has a peer.
       Thread* thread = *it;
-      if (thread != self && thread->HasPeer() && !thread->IsDaemon()) {
+      if (thread != self && !thread->IsDaemon()) {
         all_threads_are_daemons = false;
         break;
       }