diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index 61a6690f7d8..a3727cea87c 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -1311,7 +1311,7 @@ nsBrowserWindow::nsBrowserWindow()
 #if XXX
     gTitleSuffix = GetTitleSuffix();
 #endif
-    if ( gTitleSuffix = new nsString )
+    if ( (gTitleSuffix = new nsString) != 0 )
       gTitleSuffix->AssignWithConversion(" - Raptor");
   }
   AddBrowser(this);
@@ -2058,7 +2058,7 @@ nsBrowserWindow::FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aRes
       nsXPIDLString name;
       nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mDocShell));
       if (NS_OK == docShellAsItem->GetName(getter_Copies(name))) {
-        if (aNameStr.Equals(name)) {
+        if (aNameStr.EqualsWithConversion(name)) {
           aResult = webShell;
           NS_ADDREF(aResult);
           return NS_OK;
diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
index 6474f5ab338..3b7c2d4fdf7 100644
--- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
@@ -435,7 +435,7 @@ nsXPBaseWindow::FindWebShellWithName(const PRUnichar* aName,
   if (webShell) {
     nsXPIDLString name;
     if (NS_SUCCEEDED(docShellAsItem->GetName(getter_Copies(name)))) {
-      if (aNameStr.Equals(name)) {
+      if (aNameStr.EqualsWithConversion(name)) {
         aResult = webShell;
         NS_ADDREF(aResult);
         return NS_OK;
diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
index 3c9bb8bf18c..9e822713569 100644
--- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -391,7 +391,7 @@ nsHTTPIndexParser::OnStartRequest(nsIChannel* aChannel, nsISupports* aContext)
 
   // we know that this is a directory (due to being a HTTP-INDEX response)
   // so ensure it ends with a slash if its a FTP URL
-  nsAutoString	fullURI(uristr);
+  nsAutoString	fullURI; fullURI.AssignWithConversion(uristr);
   if ((fullURI.Find("ftp://", PR_TRUE) == 0) && (fullURI.Last() != (PRUnichar('/'))))
   {
   	fullURI.AppendWithConversion('/');