--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1987,17 +1987,17 @@ DSTOffsetCache::purge()
  */
 DSTOffsetCache::DSTOffsetCache()
 {
     purge();
 }
 
 JSContext::JSContext(JSRuntime *rt)
   : runtime(rt),
-    compartment(rt->defaultCompartment),
+    compartment(NULL),
     regs(NULL),
     busyArrays(thisInInitializer())
 {}
 
 void
 JSContext::resetCompartment()
 {
     JSObject *scopeobj;

--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -7584,20 +7584,16 @@ disable_debugger_exceptions() { }
 
 #define K *1024
 #define M K K
 #define G K M
 
 void
 SetMaxCodeCacheBytes(JSContext* cx, uint32 bytes)
 {
-#ifdef DEBUG
-    TraceMonitor* tm = &JS_TRACE_MONITOR(cx);
-    JS_ASSERT(tm->codeAlloc && tm->dataAlloc && tm->traceAlloc);
-#endif
     if (bytes > 1 G)
         bytes = 1 G;
     if (bytes < 128 K)
         bytes = 128 K;
     JS_THREAD_DATA(cx)->maxCodeCacheBytes = bytes;
 }
 
 bool