diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
index e7e084f69c..34172e5ccc 100644
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -230,7 +230,9 @@ WebrtcVideoConduit::~WebrtcVideoConduit()
     mVideoStatsTimer->Cancel();
   }
 
+  #ifdef MOZ_WEBRTC_LEGACY_VIE
   MOZ_ASSERT(!mPtrViEBase, "Call DeleteStreams prior to ~WebrtcVideoConduit.");
+  #endif
 }
 
 void
diff --git a/modules/zlib/src/moz.build b/modules/zlib/src/moz.build
index 1acae55bff..72a2c6a783 100644
--- a/modules/zlib/src/moz.build
+++ b/modules/zlib/src/moz.build
@@ -38,7 +38,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
         DEFINES['INFLATE_CHUNK_SIMD_SSE2'] = False
         DEFINES['CRC32_SIMD_SSE42_PCLMUL'] = False
         SOURCES += [
-            'simd_darwin_stub.c',
+            'simd_stub.c',
         ]
     else:
         DEFINES['INFLATE_CHUNK_SIMD_SSE2'] = True
diff --git a/mozconfigs/uxp-linux-x64 b/mozconfigs/uxp-linux-x64
index 5a879edb5c..b88360fb17 100644
--- a/mozconfigs/uxp-linux-x64
+++ b/mozconfigs/uxp-linux-x64
@@ -21,9 +21,9 @@ ac_add_options --disable-updater
 
 # Optimization settings
 ac_add_options --disable-accessibility
-ac_add_options --disable-debug
+ac_add_options --enable-debug
 ac_add_options --disable-debug-js-modules
-ac_add_options --disable-debug-symbols
+ac_add_options --enable-debug-symbols
 ac_add_options --disable-tests
 ac_add_options --enable-devtools
 #ac_add_options --enable-install-strip