diff --git a/mozilla/network/module/nsStubContext.cpp b/mozilla/network/module/nsStubContext.cpp
index bbc4ce0db8d..3a7b26f272f 100644
--- a/mozilla/network/module/nsStubContext.cpp
+++ b/mozilla/network/module/nsStubContext.cpp
@@ -84,7 +84,7 @@ void stub_Alert(MWContext *context,
 {
     nsINetSupport *ins;
 
-    if (ins = getNetSupport(context->modular_data)) {
+    if (nsnull != (ins = getNetSupport(context->modular_data))) {
         nsString str(msg);
         ins->Alert(str);
         ins->Release();
@@ -103,7 +103,7 @@ XP_Bool stub_Confirm(MWContext *context,
 {
     nsINetSupport *ins;
     
-    if (ins = getNetSupport(context->modular_data)) {
+    if (nsnull != (ins = getNetSupport(context->modular_data))) {
         XP_Bool res;
         nsString str(msg);
         res = ins->Confirm(str);
@@ -121,7 +121,7 @@ char *stub_Prompt(MWContext *context,
 {
     nsINetSupport *ins;
     
-    if (ins = getNetSupport(context->modular_data)) {
+    if (nsnull != (ins = getNetSupport(context->modular_data))) {
         nsString str(msg);
         nsString defStr(def);
         nsString res;
@@ -151,7 +151,7 @@ stub_PromptUsernameAndPassword(MWContext *context,
 {
     nsINetSupport *ins;
     
-    if (ins = getNetSupport(context->modular_data)) {
+    if (nsnull != (ins = getNetSupport(context->modular_data))) {
         nsString str(msg);
         nsString userStr;
         nsString pwdStr;
@@ -186,7 +186,7 @@ char *stub_PromptPassword(MWContext *context,
 {
     nsINetSupport *ins;
     
-    if (ins = getNetSupport(context->modular_data)) {
+    if (nsnull != (ins = getNetSupport(context->modular_data))) {
         nsString str(msg);
         nsString res;
         if (ins->PromptPassword(msg, res)) {
@@ -216,7 +216,7 @@ PRIVATE void stub_GraphProgressInit(MWContext  *context,
     if (URL_s->load_background)
         return;
 
-    if (pListener = getStreamListener(URL_s)) {
+    if (nsnull != (pListener = getStreamListener(URL_s))) {
         nsConnectionInfo *pConn = (nsConnectionInfo *) URL_s->fe_data;
         pListener->OnProgress(pConn->pURL, 0, content_length);
         pListener->Release();
@@ -235,7 +235,7 @@ PRIVATE void stub_GraphProgress(MWContext  *context,
     if (URL_s->load_background)
         return;
 
-    if (pListener = getStreamListener(URL_s)) {
+    if (nsnull != (pListener = getStreamListener(URL_s))) {
         nsConnectionInfo *pConn = (nsConnectionInfo *) URL_s->fe_data;
         pListener->OnProgress(pConn->pURL, bytes_received, 
                               content_length);
@@ -259,7 +259,7 @@ PRIVATE void stub_GraphProgressDestroy(MWContext  *context,
     if (URL_s->load_background)
         return;
 
-    if (pListener = getStreamListener(URL_s)) {
+    if (nsnull != (pListener = getStreamListener(URL_s))) {
         nsConnectionInfo *pConn = (nsConnectionInfo *) URL_s->fe_data;
         pListener->OnProgress(pConn->pURL, total_bytes_read, 
                               content_length);
@@ -270,7 +270,7 @@ PRIVATE void stub_Progress(MWContext *context, const char *msg)
 {
     nsIStreamListener *pListener;
 
-    if (pListener = getStreamListener(context->modular_data)) {
+    if (nsnull != (pListener = getStreamListener(context->modular_data))) {
         nsConnectionInfo *pConn = 
             (nsConnectionInfo *) context->modular_data->fe_data;
         nsAutoString status(msg);
diff --git a/mozilla/network/module/nsURL.cpp b/mozilla/network/module/nsURL.cpp
index db8cceb74b7..6a03e5425a3 100644
--- a/mozilla/network/module/nsURL.cpp
+++ b/mozilla/network/module/nsURL.cpp
@@ -37,7 +37,7 @@ class URLImpl : public nsIURL {
 public:
   URLImpl(const nsString& aSpec);
   URLImpl(const nsIURL* aURL, const nsString& aSpec);
-  ~URLImpl();
+  virtual ~URLImpl();
 
   NS_DECL_ISUPPORTS