diff --git a/mozilla/network/module/nsNetFile.cpp b/mozilla/network/module/nsNetFile.cpp
index 81312bd3a1d..aa97c555c9b 100644
--- a/mozilla/network/module/nsNetFile.cpp
+++ b/mozilla/network/module/nsNetFile.cpp
@@ -34,7 +34,7 @@ PL_CompareFileAssoc(const void *v1, const void *v2)
     nsFileAssoc *a = (nsFileAssoc*)v1;
     nsFileAssoc *b = (nsFileAssoc*)v2;
 
-    return *a->name == *b->name;
+    return *a->name.GetUnicode() == *b->name.GetUnicode();
 }
 
 nsNetFile::nsNetFile() {
diff --git a/mozilla/network/module/nsNetService.cpp b/mozilla/network/module/nsNetService.cpp
index 9e1eb91b19f..867310d780f 100644
--- a/mozilla/network/module/nsNetService.cpp
+++ b/mozilla/network/module/nsNetService.cpp
@@ -1006,7 +1006,7 @@ protected:
 
 PRUint32 nsStringHashKey::HashValue(void) const
 {
-    return nsCRT::HashValue(mName);
+    return nsCRT::HashValue(mName.GetUnicode());
 }
 
 PRBool nsStringHashKey::Equals(const nsHashKey *aKey) const
@@ -1457,7 +1457,7 @@ static void bam_exit_routine(URL_Struct *URL_s, int status, MWContext *window_id
             if ((nsConnectionActive == pConn->mStatus) && 
                 (nsnull != pConn->pConsumer)) {
                 nsAutoString status;
-                pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_FAILED, status);
+                pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_FAILED, status.GetUnicode());
                 NS_RELEASE(pConn->pConsumer);
             }
 
diff --git a/mozilla/network/module/nsStubContext.cpp b/mozilla/network/module/nsStubContext.cpp
index fa368945bc6..fe2150f22b4 100644
--- a/mozilla/network/module/nsStubContext.cpp
+++ b/mozilla/network/module/nsStubContext.cpp
@@ -359,7 +359,7 @@ PRIVATE void stub_Progress(MWContext *context, const char *msg)
         nsConnectionInfo *pConn = 
             (nsConnectionInfo *) context->modular_data->fe_data;
         nsAutoString status(msg);
-        pListener->OnStatus(pConn->pURL, status);
+        pListener->OnStatus(pConn->pURL, status.GetUnicode());
         NS_RELEASE(pListener);
     } else {
         printf("%s\n", msg);
@@ -582,7 +582,7 @@ void stub_complete(NET_StreamClass *stream)
     /* Notify the Data Consumer that the Binding has completed... */
     if (pConn->pConsumer) {
         nsAutoString status;
-        pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_SUCCEEDED, status);
+        pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_SUCCEEDED, status.GetUnicode());
         pConn->mStatus = nsConnectionSucceeded;
     }
 
@@ -611,7 +611,7 @@ void stub_abort(NET_StreamClass *stream, int status)
     if (pConn->pConsumer) {
         nsAutoString status;
 
-        pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_ABORTED, status);
+        pConn->pConsumer->OnStopBinding(pConn->pURL, NS_BINDING_ABORTED, status.GetUnicode());
         pConn->mStatus = nsConnectionAborted;
     }