diff --git a/mozilla/modules/libpref/src/nsAutoConfig.cpp b/mozilla/modules/libpref/src/nsAutoConfig.cpp
index 56e051ae826..6242324ec04 100644
--- a/mozilla/modules/libpref/src/nsAutoConfig.cpp
+++ b/mozilla/modules/libpref/src/nsAutoConfig.cpp
@@ -302,7 +302,7 @@ nsresult nsAutoConfig::downloadAutoConfig()
     
     if (NS_SUCCEEDED(rv) && appendMail) {
         rv = getEmailAddr(emailAddr);
-        if (NS_SUCCEEDED(rv) && emailAddr) {
+        if (NS_SUCCEEDED(rv) && emailAddr.get()) {
 
             /* Adding the unique identifier at the end of autoconfig URL. 
                In this case the autoconfig URL is a script and 
@@ -317,7 +317,7 @@ nsresult nsAutoConfig::downloadAutoConfig()
     nsCOMPtr<nsIURI> url;
     nsCOMPtr<nsIChannel> channel;
     
-    rv = NS_NewURI(getter_AddRefs(url), mConfigURL, nsnull, nsnull);
+    rv = NS_NewURI(getter_AddRefs(url), mConfigURL.get(), nsnull, nsnull);
     if (NS_FAILED(rv))
         return rv;
 
@@ -544,7 +544,7 @@ nsresult nsAutoConfig::getEmailAddr(nsAWritableCString & emailAddr)
         emailAddr = nsDependentCString(prefValue, len);
     }
     else {
-        if (mCurrProfile) {
+        if (mCurrProfile.get()) { // XXXjag this is always non-null. Did you mean !IsEmpty()?
             emailAddr = mCurrProfile;
         }
     }
diff --git a/mozilla/modules/libpref/src/nsPrefBranch.cpp b/mozilla/modules/libpref/src/nsPrefBranch.cpp
index 98a2800afe7..696904da9d9 100644
--- a/mozilla/modules/libpref/src/nsPrefBranch.cpp
+++ b/mozilla/modules/libpref/src/nsPrefBranch.cpp
@@ -720,7 +720,7 @@ void nsPrefBranch::freeObserverList(void)
         pCallback = (PrefCallbackData *)mObservers->ElementAt(i);
         if (pCallback) {
           mObserverDomains.CStringAt(i, domain);
-          PREF_UnregisterCallback(domain, NotifyObserver, pCallback);
+          PREF_UnregisterCallback(domain.get(), NotifyObserver, pCallback);
           NS_RELEASE(pCallback->pObserver);
           nsMemory::Free(pCallback);
         }