diff --git a/mozilla/xpinstall/src/nsInstallFileOpItem.cpp b/mozilla/xpinstall/src/nsInstallFileOpItem.cpp
index 5c575b0a0ff..176ecbff948 100644
--- a/mozilla/xpinstall/src/nsInstallFileOpItem.cpp
+++ b/mozilla/xpinstall/src/nsInstallFileOpItem.cpp
@@ -250,7 +250,8 @@ char* nsInstallFileOpItem::toString()
 
 PRInt32 nsInstallFileOpItem::Prepare()
 {
-	return nsInstall::SUCCESS;
+    // no set-up necessary
+    return nsInstall::SUCCESS;
 }
 
 void nsInstallFileOpItem::Abort()
diff --git a/mozilla/xpinstall/src/nsInstallTrigger.cpp b/mozilla/xpinstall/src/nsInstallTrigger.cpp
index a5d7053d597..e667d1f6a78 100644
--- a/mozilla/xpinstall/src/nsInstallTrigger.cpp
+++ b/mozilla/xpinstall/src/nsInstallTrigger.cpp
@@ -187,7 +187,8 @@ nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRIn
 {
     nsresult rv = NS_ERROR_OUT_OF_MEMORY;
 
-    // The Install manager will delete itself when done
+    // The Install manager will delete itself when done, once we've called
+    // InitManager. Before then **WE** must delete it
     nsXPInstallManager *mgr = new nsXPInstallManager();
     if (mgr)
     {
@@ -203,15 +204,13 @@ nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRIn
             }
             else
             {
-                rv = NS_ERROR_OUT_OF_MEMORY;
                 delete trigger;
+                delete mgr;
             }
         }
         else
-            rv = NS_ERROR_OUT_OF_MEMORY;
+            delete mgr;
     }
-    else
-        rv = NS_ERROR_OUT_OF_MEMORY;
 
     *aReturn = NS_OK;  // maybe we should do something more.
     return rv;
@@ -429,7 +428,7 @@ nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFile
 
 nsInstallTriggerFactory::nsInstallTriggerFactory(void)
 {
-    NS_INIT_REFCNT();
+    NS_INIT_ISUPPORTS();
 }
 
 nsInstallTriggerFactory::~nsInstallTriggerFactory(void)
diff --git a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
index fc41db076d4..1ac45925045 100644
--- a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
+++ b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
@@ -408,94 +408,80 @@ InstallTriggerGlobalCompareVersion(JSContext *cx, JSObject *obj, uintN argc, jsv
 {
   nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
   PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1str;
-  PRInt32      b1int;
-  PRInt32      b2int;
-  PRInt32      b3int;
-  PRInt32      b4int;
+  nsAutoString regname;
+  nsAutoString version;
+  int32        major,minor,release,build;
 
   *rval = JSVAL_NULL;
 
   if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
     return JS_FALSE;
 
-  if(argc >= 5)
+  if (argc < 2 )
+  {
+    JS_ReportError(cx, "CompareVersion requires at least 2 parameters");
+    return JS_FALSE;
+  }
+  else if ( !JSVAL_IS_STRING(argv[0]) )
+  {
+    JS_ReportError(cx, "Invalid parameter passed to CompareVersion");
+    return JS_FALSE;
+  }
+
+  // get the registry name argument
+  ConvertJSValToStr(regname, cx, argv[0]);
+
+  if (argc = 2 )
+  {
+    //  public int CompareVersion(String registryName, String version)
+    //  --OR-- CompareVersion(String registryNamve, InstallVersion version)
+
+    ConvertJSValToStr(version, cx, argv[1]);
+    if(NS_OK != nativeThis->CompareVersion(regname, version, &nativeRet))
+    {
+          return JS_FALSE;
+    }
+  }
+  else
   {
     //  public int CompareVersion(String registryName,
     //                            int    major,
     //                            int    minor,
     //                            int    release,
     //                            int    build);
+    //
+    //  minor, release, and build values are optional
 
-    ConvertJSValToStr(b0, cx, argv[0]);
+    major = minor = release = build = 0;
 
-    if(!JS_ValueToInt32(cx, argv[1], (int32 *)&b1int))
+    if(!JS_ValueToInt32(cx, argv[1], &major))
     {
       JS_ReportError(cx, "2th parameter must be a number");
       return JS_FALSE;
     }
-    if(!JS_ValueToInt32(cx, argv[2], (int32 *)&b2int))
+    if( argc > 2 && !JS_ValueToInt32(cx, argv[2], &minor) )
     {
       JS_ReportError(cx, "3th parameter must be a number");
       return JS_FALSE;
     }
-    if(!JS_ValueToInt32(cx, argv[3], (int32 *)&b3int))
+    if( argc > 3 && !JS_ValueToInt32(cx, argv[3], &release) )
     {
       JS_ReportError(cx, "4th parameter must be a number");
       return JS_FALSE;
     }
-    if(!JS_ValueToInt32(cx, argv[4], (int32 *)&b4int))
+    if( argc > 4 && !JS_ValueToInt32(cx, argv[4], &build) )
     {
       JS_ReportError(cx, "5th parameter must be a number");
       return JS_FALSE;
     }
 
-    if(NS_OK != nativeThis->CompareVersion(b0, b1int, b2int, b3int, b4int, &nativeRet))
+    if(NS_OK != nativeThis->CompareVersion(regname, major, minor, release, build, &nativeRet))
     {
       return JS_FALSE;
     }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else if(argc >= 2)
-  {
-    //  public int CompareVersion(String registryName,
-    //                            String version); --OR-- VersionInfo version
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if(JSVAL_IS_OBJECT(argv[1]))
-    {
-        JSObject* jsobj = JSVAL_TO_OBJECT(argv[1]);
-        JSClass* jsclass = JS_GetClass(cx, jsobj);
-        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
-        {
-          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
-
-          if(NS_OK != nativeThis->CompareVersion(b0, version, &nativeRet))
-          {
-                return JS_FALSE;
-          }
-        }
-    }
-    else
-    {
-        ConvertJSValToStr(b1str, cx, argv[1]);
-        if(NS_OK != nativeThis->CompareVersion(b0, b1str, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "Function CompareVersion requires 5 parameters");
-    return JS_FALSE;
   }
 
+  *rval = INT_TO_JSVAL(nativeRet);
   return JS_TRUE;
 }
 
diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.h b/mozilla/xpinstall/src/nsSoftwareUpdate.h
index 93afbf1a94b..5ad0abca0d5 100644
--- a/mozilla/xpinstall/src/nsSoftwareUpdate.h
+++ b/mozilla/xpinstall/src/nsSoftwareUpdate.h
@@ -24,7 +24,9 @@ class nsSoftwareUpdate:  public nsIAppShellComponent, public nsISoftwareUpdate
     public:
         
         NS_DEFINE_STATIC_CID_ACCESSOR( NS_SoftwareUpdate_CID );
+
         static nsSoftwareUpdate *GetInstance();
+
         nsSoftwareUpdate();
         virtual ~nsSoftwareUpdate();
 
@@ -42,10 +44,11 @@ class nsSoftwareUpdate:  public nsIAppShellComponent, public nsISoftwareUpdate
         NS_IMETHOD InstallJarCallBack();
         NS_IMETHOD GetMasterNotifier(nsIXPINotifier **notifier);
         NS_IMETHOD SetActiveNotifier(nsIXPINotifier *notifier);
-
+        
 
     private:
-        static nsSoftwareUpdate* mInstance;
+        static   nsSoftwareUpdate* mInstance;
+
         nsresult RunNextInstall();
         nsresult DeleteScheduledNodes();