diff --git a/netwerk/protocol/file/src/nsFileChannel.cpp b/netwerk/protocol/file/src/nsFileChannel.cpp
index c40f1ded8d12..1e80ab5acfe4 100644
--- a/netwerk/protocol/file/src/nsFileChannel.cpp
+++ b/netwerk/protocol/file/src/nsFileChannel.cpp
@@ -325,7 +325,7 @@ nsFileChannel::AsyncRead(nsIStreamListener *listener,
   done:
     if (NS_FAILED(rv)) {
         nsresult rv2 = mLoadGroup->RemoveChannel(this, ctxt, rv, nsnull);       // XXX fix error message
-        NS_ASSERTION(NS_SUCCEEDED(rv), "RemoveChannel failed");
+        NS_ASSERTION(NS_SUCCEEDED(rv2), "RemoveChannel failed");
         // release the transport so that we don't think we're in progress
         mFileTransport = nsnull;
     }
@@ -377,7 +377,7 @@ nsFileChannel::AsyncWrite(nsIInputStream *fromStream,
   done:
     if (NS_FAILED(rv)) {
         nsresult rv2 = mLoadGroup->RemoveChannel(this, ctxt, rv, nsnull);       // XXX fix error message
-        NS_ASSERTION(NS_SUCCEEDED(rv), "RemoveChannel failed");
+        NS_ASSERTION(NS_SUCCEEDED(rv2), "RemoveChannel failed");
         // release the transport so that we don't think we're in progress
         mFileTransport = nsnull;
     }
diff --git a/netwerk/protocol/res/src/nsResChannel.cpp b/netwerk/protocol/res/src/nsResChannel.cpp
index 7e1987fbfab2..57c18e534015 100644
--- a/netwerk/protocol/res/src/nsResChannel.cpp
+++ b/netwerk/protocol/res/src/nsResChannel.cpp
@@ -692,6 +692,8 @@ nsResChannel::OnStopRequest(nsIChannel* transportChannel, nsISupports* context,
             return AsyncRead(GetUserListener(), mUserContext);
           case ASYNC_WRITE:
             return AsyncWrite(mFromStream, mUserObserver, mUserContext);
+          default:
+            break;
         }
     }
     return EndRequest(aStatus, aMsg);
diff --git a/xpcom/tests/TestThreads.cpp b/xpcom/tests/TestThreads.cpp
index 29f9c45d2e13..a71ef162da93 100644
--- a/xpcom/tests/TestThreads.cpp
+++ b/xpcom/tests/TestThreads.cpp
@@ -39,7 +39,7 @@ public:
             printf("failed to get current thread\n");
             return rv;
         }
-        printf("running %d on thread %x\n", mNum, thread);
+        printf("running %d on thread %x\n", mNum, thread.get());
 
         // if we don't do something slow, we'll never see the other
         // worker threads run