diff --git a/xpfe/macbuild/xpfeviewer.mcp b/xpfe/macbuild/xpfeviewer.mcp
index bb284a2d752..520c8e4dfb8 100644
Binary files a/xpfe/macbuild/xpfeviewer.mcp and b/xpfe/macbuild/xpfeviewer.mcp differ
diff --git a/xpfe/xpviewer/src/nsBrowserWindow.cpp b/xpfe/xpviewer/src/nsBrowserWindow.cpp
index 0a3ee8ed258..efde3462704 100644
--- a/xpfe/xpviewer/src/nsBrowserWindow.cpp
+++ b/xpfe/xpviewer/src/nsBrowserWindow.cpp
@@ -2883,7 +2883,8 @@ nsBrowserWindow::DumpFrames(FILE* out, nsString *aFilterName)
 {
   nsIPresShell* shell = GetPresShell();
   if (nsnull != shell) {
-    nsIFrame* root = shell->GetRootFrame();
+    nsIFrame* root;
+    shell->GetRootFrame(root);
     if (nsnull != root) {
       nsIListFilter *filter = nsIFrame::GetFilter(aFilterName);
       root->List(out, 0, filter);
@@ -2998,7 +2999,8 @@ nsBrowserWindow::DumpStyleContexts(FILE* out)
   if (nsnull == styleSet) {
     fputs("null style set\n", out);
   } else {
-    nsIFrame* root = shell->GetRootFrame();
+    nsIFrame* root;
+    shell->GetRootFrame(root);
     if (nsnull == root) {
     fputs("null root frame\n", out);
     } else {
@@ -3071,7 +3073,7 @@ nsBrowserWindow::ShowFrameSize()
       return;
       }
       nsIFrame* root;
-      root = shell->GetRootFrame();
+      shell->GetRootFrame(root);
       if (nsnull != root) {
       root->SizeOf(szh);
       PRUint32 totalSize;
diff --git a/xpfe/xpviewer/src/nsSetupRegistry.cpp b/xpfe/xpviewer/src/nsSetupRegistry.cpp
index df3a9b33433..61977c19aa7 100644
--- a/xpfe/xpviewer/src/nsSetupRegistry.cpp
+++ b/xpfe/xpviewer/src/nsSetupRegistry.cpp
@@ -130,7 +130,7 @@ static NS_DEFINE_IID(kCXMLDocument, NS_XMLDOCUMENT_CID);
 static NS_DEFINE_IID(kCImageDocument, NS_IMAGEDOCUMENT_CID);
 static NS_DEFINE_IID(kCRangeListCID, NS_RANGELIST_CID);
 static NS_DEFINE_IID(kCRangeCID, NS_RANGE_CID);
-static NS_DEFINE_IID(kCHTMLImageElementFactory, NS_HTMLIMAGEELEMENTFACTORY_CID);
+static NS_DEFINE_IID(kCHTMLImageElement, NS_HTMLIMAGEELEMENT_CID);
 static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
 
 static NS_DEFINE_IID(kCImageButtonCID, NS_IMAGEBUTTON_CID);
@@ -188,7 +188,7 @@ NS_SetupRegistry()
   nsRepository::RegisterFactory(kCImageDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kCRangeListCID, LAYOUT_DLL, PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kCRangeCID, LAYOUT_DLL, PR_FALSE, PR_FALSE);
-  nsRepository::RegisterFactory(kCHTMLImageElementFactory, LAYOUT_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterFactory(kCHTMLImageElement, LAYOUT_DLL, PR_FALSE, PR_FALSE);
 
   nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE);