diff --git a/java/xpcom/xpcom/bcXPCOMStub.cpp b/java/xpcom/xpcom/bcXPCOMStub.cpp
index f7ddc9145227..8720f27bb7b0 100644
--- a/java/xpcom/xpcom/bcXPCOMStub.cpp
+++ b/java/xpcom/xpcom/bcXPCOMStub.cpp
@@ -103,7 +103,7 @@ void bcXPCOMStub::DispatchAndSaveThread(bcICall *call, nsIEventQueue *eventQueue
         mt = new bcXPCOMMarshalToolkit(mid, interfaceInfo, params, call->GetORB());
         bcIUnMarshaler * um = call->GetUnMarshaler();
         mt->UnMarshal(um);
-        //delete um;
+        delete um;
     }
     //push caller eventQ
     nsCOMPtr<bcIXPCOMStubsAndProxies> stubsAndProxiesService;
@@ -112,12 +112,12 @@ void bcXPCOMStub::DispatchAndSaveThread(bcICall *call, nsIEventQueue *eventQueue
     //nb return value; excepion handling
     PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade about to XPTC_InvokeByIndex\n"));
     XPTC_InvokeByIndex(object, mid, paramCount, params);
-    PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade after XPTC_InvokeByIndex\n"));                
+    PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade after XPTC_InvokeByIndex\n"));
     if (mt != NULL) { //nb to do what about nsresult ?
-        bcIMarshaler * m = call->GetMarshaler();    
-        PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade about to mt->Marshal\n"));                
+        bcIMarshaler * m = call->GetMarshaler();
+        PR_LOG(log, PR_LOG_DEBUG, ("--bcXPCOMStub::DispatchAndSaveThreade about to mt->Marshal\n"));
         mt->Marshal(m);
-        //delete m;
+        delete m;
     }
     delete mt;
     //pop caller eventQueue
diff --git a/java/xpcom/xpcom/bcXPCOMStubsAndProxies.cpp b/java/xpcom/xpcom/bcXPCOMStubsAndProxies.cpp
index d39d1c6dd53b..5228eec70c9e 100644
--- a/java/xpcom/xpcom/bcXPCOMStubsAndProxies.cpp
+++ b/java/xpcom/xpcom/bcXPCOMStubsAndProxies.cpp
@@ -41,7 +41,7 @@ static  nsModuleComponentInfo components[] =
 
 NS_IMPL_NSGETMODULE("BlackConnect XPCOM stubs and proxies",components);
 
-NS_IMPL_ISUPPORTS(bcXPCOMStubsAndProxies,NS_GET_IID(bcXPCOMStubsAndProxies));
+NS_IMPL_THREADSAFE_ISUPPORTS(bcXPCOMStubsAndProxies,NS_GET_IID(bcXPCOMStubsAndProxies));
 
 
 
@@ -79,7 +79,7 @@ bcXPCOMStubsAndProxies::~bcXPCOMStubsAndProxies() {
 
 NS_IMETHODIMP bcXPCOMStubsAndProxies::GetStub(nsISupports *obj, bcIStub **stub) {
     if (!stub) {
-	return NS_ERROR_NULL_POINTER;
+        return NS_ERROR_NULL_POINTER;
     }
     *stub = new bcXPCOMStub(obj);
     return NS_OK;