diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp
index 031b237b42a..8f8266c02fb 100644
--- a/content/base/src/nsGenericDOMDataNode.cpp
+++ b/content/base/src/nsGenericDOMDataNode.cpp
@@ -1343,7 +1343,7 @@ nsGenericDOMDataNode::AppendTextTo(nsAString& aResult)
   if (mText.Is2b()) {
     aResult.Append(mText.Get2b(), mText.GetLength());
   } else {
-    AppendASCIItoUTF16(mText.Get1b(), aResult);
+    AppendUTF8toUTF16(mText.Get1b(), aResult);
   }
 
   return NS_OK;
diff --git a/content/html/content/src/nsAttributeContent.cpp b/content/html/content/src/nsAttributeContent.cpp
index 2be1dd7e668..d370fdbb000 100644
--- a/content/html/content/src/nsAttributeContent.cpp
+++ b/content/html/content/src/nsAttributeContent.cpp
@@ -573,7 +573,7 @@ nsAttributeContent::AppendTextTo(nsAString& aResult)
     aResult.Append(mText.Get2b(), mText.GetLength());
   }
   else {
-    AppendASCIItoUTF16(mText.Get1b(), aResult);
+    AppendUTF8toUTF16(mText.Get1b(), aResult);
   }
 
   return NS_OK;
diff --git a/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/netwerk/streamconv/converters/nsIndexedToHTML.cpp
index 50628b2594a..46a8cf13693 100644
--- a/netwerk/streamconv/converters/nsIndexedToHTML.cpp
+++ b/netwerk/streamconv/converters/nsIndexedToHTML.cpp
@@ -299,7 +299,7 @@ nsIndexedToHTML::OnStartRequest(nsIRequest* request, nsISupports *aContext) {
     buffer.Append(strNCR);
 
     buffer.Append(NS_LITERAL_STRING("</title><base href=\""));    
-    AppendASCIItoUTF16(baseUri, buffer);
+    buffer.Append(NS_ConvertASCIItoUCS2(baseUri));
     buffer.Append(NS_LITERAL_STRING("\"/>\n"));
 
     buffer.Append(NS_LITERAL_STRING("<style type=\"text/css\">\n") +