diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
index a382d32589b..d1b2ae77e2c 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -307,7 +307,8 @@ void nsBaseWidget::AddChild(nsIWidget* aChild)
 //-------------------------------------------------------------------------
 void nsBaseWidget::RemoveChild(nsIWidget* aChild)
 {
-  NS_ASSERTION(aChild->GetParent() == NS_STATIC_CAST(nsIWidget*, this),
+  NS_ASSERTION(nsCOMPtr<nsIWidget>(dont_AddRef(aChild->GetParent())) ==
+                 NS_STATIC_CAST(nsIWidget*, this),
                "Not one of our kids!");
   
   if (mLastChild == aChild) {
@@ -1029,7 +1030,7 @@ case _value: eventName.AssignWithConversion(_name) ; break
 //////////////////////////////////////////////////////////////
 struct PrefPair
 {
-  char * name;
+  const char * name;
   PRBool value;
 };