diff --git a/expat/xmlparse/xmlparse.c b/expat/xmlparse/xmlparse.c
index d9df3a8ecf6e..4b4d3e10473e 100644
--- a/expat/xmlparse/xmlparse.c
+++ b/expat/xmlparse/xmlparse.c
@@ -2066,14 +2066,14 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity,
     }
     else if (encodingName) {
       enum XML_Error result;
-      const XML_Char *s = poolStoreString(&tempPool,
+      const XML_Char *str = poolStoreString(&tempPool,
 					  encoding,
 					  encodingName,
 					  encodingName
 					  + XmlNameLength(encoding, encodingName));
-      if (!s)
+      if (!str)
 	return XML_ERROR_NO_MEMORY;
-      result = handleUnknownEncoding(parser, s);
+      result = handleUnknownEncoding(parser, str);
       poolDiscard(&tempPool);
       if (result == XML_ERROR_UNKNOWN_ENCODING)
 	eventPtr = encodingName;
diff --git a/layout/xml/content/src/nsXMLDocumentType.cpp b/layout/xml/content/src/nsXMLDocumentType.cpp
index 8d602a535d4d..81504164fd6e 100644
--- a/layout/xml/content/src/nsXMLDocumentType.cpp
+++ b/layout/xml/content/src/nsXMLDocumentType.cpp
@@ -278,7 +278,7 @@ nsXMLDocumentType::List(FILE* out, PRInt32 aIndent) const
   PRInt32 index;
   for (index = aIndent; --index >= 0; ) fputs("  ", out);
 
-  fprintf(out, "Document type...\n", mRefCnt);
+  fprintf(out, "Document type refcount: %d\n", mRefCnt);
 
   return NS_OK;
 }
diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
index d9df3a8ecf6e..4b4d3e10473e 100644
--- a/parser/expat/lib/xmlparse.c
+++ b/parser/expat/lib/xmlparse.c
@@ -2066,14 +2066,14 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity,
     }
     else if (encodingName) {
       enum XML_Error result;
-      const XML_Char *s = poolStoreString(&tempPool,
+      const XML_Char *str = poolStoreString(&tempPool,
 					  encoding,
 					  encodingName,
 					  encodingName
 					  + XmlNameLength(encoding, encodingName));
-      if (!s)
+      if (!str)
 	return XML_ERROR_NO_MEMORY;
-      result = handleUnknownEncoding(parser, s);
+      result = handleUnknownEncoding(parser, str);
       poolDiscard(&tempPool);
       if (result == XML_ERROR_UNKNOWN_ENCODING)
 	eventPtr = encodingName;