diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index bc1243526e92..c514790cd016 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -1152,8 +1152,7 @@ bool WebGLContext::PushRemoteTexture(WebGLFramebuffer* fb,
     swapChain.SetDestroyedCallback(destroyedCallback);
     mRemoteTextureOwner->RegisterTextureOwner(
         ownerId,
-        /* aIsSyncMode */ gfx::gfxVars::WebglOopAsyncPresentForceSync(),
-        /* aSharedRecycling */ !!fb);
+        /* aIsSyncMode */ gfx::gfxVars::WebglOopAsyncPresentForceSync());
   }
 
   MOZ_ASSERT(fb || surf);
diff --git a/gfx/layers/ipc/CanvasTranslator.cpp b/gfx/layers/ipc/CanvasTranslator.cpp
index 4eb66d16a5e6..4ed3d93824c3 100644
--- a/gfx/layers/ipc/CanvasTranslator.cpp
+++ b/gfx/layers/ipc/CanvasTranslator.cpp
@@ -347,6 +347,8 @@ void CanvasTranslator::ActorDestroy(ActorDestroyReason why) {
 }
 
 void CanvasTranslator::FinishShutdown() {
+  MOZ_ASSERT(gfx::CanvasRenderThread::IsInCanvasRenderThread());
+
   ClearTextureInfo();
 }
 
diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp
index c2ef022035b3..fd7fad5f8e6a 100644
--- a/xpcom/threads/nsThreadPool.cpp
+++ b/xpcom/threads/nsThreadPool.cpp
@@ -370,7 +370,6 @@ nsThreadPool::Dispatch(already_AddRefed<nsIRunnable> aEvent, uint32_t aFlags) {
   LOG(("THRD-P(%p) dispatch [%p %x]\n", this, /* XXX aEvent*/ nullptr, aFlags));
 
   if (NS_WARN_IF(mShutdown)) {
-    nsCOMPtr<nsIRunnable> event(aEvent);
     return NS_ERROR_NOT_AVAILABLE;
   }