diff --git a/port/port_chromium.cc b/port/port_chromium.cc
index e25c1b7..4026aa3 100644
--- a/port/port_chromium.cc
+++ b/port/port_chromium.cc
@@ -8,7 +8,6 @@
 
 #if defined(USE_SNAPPY)
 #  include "third_party/snappy/src/snappy.h"
-#  include "snappy-stubs-public.h"
 #endif
 
 namespace leveldb {
diff --git a/util/env_chromium.cc b/util/env_chromium.cc
index e39ac71..49666f6 100644
--- a/util/env_chromium.cc
+++ b/util/env_chromium.cc
@@ -594,10 +594,8 @@ void ChromiumEnv::StartThread(void (*function)(void* arg), void* arg) {
   new Thread(function, arg); // Will self-delete.
 }
 
-// TODO(jorlow): This won't co-exist with Chrome. Need to find a better way.
-::base::AtExitManager exit_manager;
-
-::base::LazyInstance<ChromiumEnv> default_env(::base::LINKER_INITIALIZED);
+::base::LazyInstance<ChromiumEnv, ::base::LeakyLazyInstanceTraits<ChromiumEnv> >
+    default_env(::base::LINKER_INITIALIZED);
 
 }