diff --git a/plugin/oji/MRJ/plugin/MRJPlugin.xml b/plugin/oji/MRJ/plugin/MRJPlugin.xml
index 9363cfd6fb82..86e42cb79cab 100644
--- a/plugin/oji/MRJ/plugin/MRJPlugin.xml
+++ b/plugin/oji/MRJ/plugin/MRJPlugin.xml
@@ -847,7 +847,7 @@
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>üêØ</VALUE></SETTING>
+                    <SETTING><VALUE>i¤</VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
                 </SETTING>
 
@@ -1200,15 +1200,6 @@
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>Project</PATHROOT>
-                    <ACCESSPATH>:::::xpcom:macbuild:</ACCESSPATH>
-                    <PATH>:xpcom.shlb</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug, WeakImport</FILEFLAGS>
-                </FILE>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>
@@ -1406,13 +1397,6 @@
                     <PATH>:Universal:Libraries:StubLibraries:TextCommon</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>PathRelative</PATHTYPE>
-                    <PATHROOT>Project</PATHROOT>
-                    <ACCESSPATH>:::::xpcom:macbuild:</ACCESSPATH>
-                    <PATH>:xpcom.shlb</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
             </LINKORDER>
             <SUBTARGETLIST>
                 <SUBTARGET>
@@ -2179,7 +2163,7 @@
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>üêØ</VALUE></SETTING>
+                    <SETTING><VALUE>i¤</VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
                 </SETTING>
 
@@ -3106,7 +3090,7 @@
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>üêØ</VALUE></SETTING>
+                    <SETTING><VALUE>i¤</VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
                 </SETTING>
 
@@ -4194,7 +4178,7 @@
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>üêØ</VALUE></SETTING>
+                    <SETTING><VALUE>i¤</VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
                 </SETTING>
 
@@ -5243,7 +5227,7 @@
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>üêØ</VALUE></SETTING>
+                    <SETTING><VALUE>i¤</VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
                 </SETTING>
 
@@ -6471,7 +6455,7 @@
                 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
                     <SETTING><VALUE></VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>üêØ</VALUE></SETTING>
+                    <SETTING><VALUE>i¤</VALUE></SETTING>
                     <SETTING><VALUE></VALUE></SETTING>
                 </SETTING>
 
@@ -6974,14 +6958,6 @@
                 <PATH>:NSStdLibStubs</PATH>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
-            <FILEREF>
-                <TARGETNAME>MRJPlugin</TARGETNAME>
-                <PATHTYPE>PathRelative</PATHTYPE>
-                <PATHROOT>Project</PATHROOT>
-                <ACCESSPATH>:::::xpcom:macbuild:</ACCESSPATH>
-                <PATH>:xpcom.shlb</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
             <FILEREF>
                 <TARGETNAME>MRJPlugin</TARGETNAME>
                 <PATHTYPE>PathRelative</PATHTYPE>
diff --git a/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp b/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
index 9684d1698f6b..4d425d63ec07 100644
--- a/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
+++ b/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
@@ -66,17 +66,20 @@ static jmethodID netscape_oji_JNIUtils_GetCurrentThread = NULL;
 static jmethodID netscape_oji_JNIUtils_GetCurrentClassLoader = NULL;
 static jmethodID netscape_oji_JNIUtils_GetObjectClassLoader = NULL;
 
-extern "C" nsresult NS_GetGlobalComponentManager(nsIComponentManager* *result);
-
 static NS_DEFINE_IID(kLiveConnectCID, NS_CLIVECONNECT_CID);
+static NS_DEFINE_IID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
+
+static nsresult getGlobalComponentManager(nsIComponentManager* *result)
+{
+    return theServiceManager->GetService(kComponentManagerCID, NS_GET_IID(nsIComponentManager),
+                                         (nsISupports**)result);
+}
 
 nsresult InitLiveConnectSupport(MRJPlugin* jvmPlugin)
 {
     theJVMPlugin = jvmPlugin;
 
-    if (&NS_GetGlobalComponentManager) {
-        NS_GetGlobalComponentManager(&theComponentManager);
-    }
+    getGlobalComponentManager(&theComponentManager);
 
     nsresult result = theServiceManager->GetService(kLiveConnectCID, NS_GET_IID(nsILiveconnect),
                                                     (nsISupports**)&theLiveConnectManager);
@@ -135,11 +138,9 @@ nsresult InitLiveConnectSupport(MRJPlugin* jvmPlugin)
 
 nsresult ShutdownLiveConnectSupport()
 {
-    
-    if (theLiveConnectManager != NULL) {
-        theLiveConnectManager->Release();
-        theLiveConnectManager = NULL;
-    }
+    NS_IF_RELEASE(theLiveConnectManager);
+
+    NS_IF_RELEASE(theComponentManager);
     
     if (theJVMPlugin != NULL) {
         theJVMPlugin = NULL;
