diff --git a/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp
index 51dfb31c4cf..8a107af3d2c 100644
--- a/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp
+++ b/mozilla/java/dom/jni/org_mozilla_dom_events_MouseEventImpl.cpp
@@ -351,16 +351,20 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_events_MouseEventImpl_initMouseEvent
   PRBool metaKeyArg  = jmetaKeyArg    == JNI_TRUE ? PR_TRUE : PR_FALSE;
 
   nsresult rv = event->InitMouseEvent(*cvalue,
-				      ctrlKeyArg, 
-				      altKeyArg, 
-				      shiftKeyArg, 
-				      metaKeyArg, 
+				      canBubble,
+				      cancelable,
+				      (nsIDOMAbstractView*) jviewArg,
+				      (PRUint16)jdetailArg,
 				      (PRInt32)jscreenXArg, 
 				      (PRInt32)jscreenYArg, 
 				      (PRInt32)jclientXArg, 
-				      (PRInt32)jclientYArg, 
+				      (PRInt32)jclientYArg, 			       
+				      ctrlKeyArg,
+				      altKeyArg,
+				      shiftKeyArg,
+				      metaKeyArg,
 				      (PRUint16)jbuttonArg, 
-				      (PRUint16)jdetailArg);
+				      (nsIDOMEventTarget*) jrelatedNodeArg);
 
   nsMemory::Free(cvalue);
 
diff --git a/mozilla/java/webclient/src_moz/CBrowserContainer.cpp b/mozilla/java/webclient/src_moz/CBrowserContainer.cpp
index d21eb8b8915..9e5610a7ed3 100644
--- a/mozilla/java/webclient/src_moz/CBrowserContainer.cpp
+++ b/mozilla/java/webclient/src_moz/CBrowserContainer.cpp
@@ -735,35 +735,30 @@ CBrowserContainer::doEndURLLoad(const PRUnichar *aDocumentName)
 ///////////////////////////////////////////////////////////////////////////////
 // nsIURIContentListener
 
-/* void onStartURIOpen (in nsIURI aURI, in string aWindowTarget, out boolean aAbortOpen); */
-NS_IMETHODIMP CBrowserContainer::OnStartURIOpen(nsIURI *pURI, const char *aWindowTarget, PRBool *aAbortOpen)
+NS_IMETHODIMP CBrowserContainer::OnStartURIOpen(nsIURI *aURI, PRBool *_retval)
 {
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* void getProtocolHandler (in nsIURI aURI, out nsIProtocolHandler aProtocolHandler); */
-NS_IMETHODIMP CBrowserContainer::GetProtocolHandler(nsIURI *aURI, nsIProtocolHandler **aProtocolHandler)
+NS_IMETHODIMP CBrowserContainer::GetProtocolHandler(nsIURI *aURI, nsIProtocolHandler **_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
-/* void doContent (in string aContentType, in nsURILoadCommand aCommand, in string aWindowTarget, in nsIChannel aOpenedChannel, out nsIStreamListener aContentHandler, out boolean aAbortProcess); */
-NS_IMETHODIMP CBrowserContainer::DoContent(const char *aContentType, nsURILoadCommand aCommand, const char *aWindowTarget, nsIRequest *request, nsIStreamListener **aContentHandler, PRBool *aAbortProcess)
+NS_IMETHODIMP CBrowserContainer::DoContent(const char *aContentType, nsURILoadCommand aCommand, nsIRequest *request, nsIStreamListener **aContentHandler, PRBool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
-/* boolean isPreferred (in string aContentType, in nsURILoadCommand aCommand, in string aWindowTarget, out string aDesiredContentType); */
-NS_IMETHODIMP CBrowserContainer::IsPreferred(const char *aContentType, nsURILoadCommand aCommand, const char *aWindowTarget, char **aDesiredContentType, PRBool *_retval)
+NS_IMETHODIMP CBrowserContainer::IsPreferred(const char *aContentType, nsURILoadCommand aCommand, char **aDesiredContentType, PRBool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
-/* boolean canHandleContent (in string aContentType, in nsURILoadCommand aCommand, in string aWindowTarget, out string aDesiredContentType); */
-NS_IMETHODIMP CBrowserContainer::CanHandleContent(const char *aContentType, nsURILoadCommand aCommand, const char *aWindowTarget, char **aDesiredContentType, PRBool *_retval)
+NS_IMETHODIMP CBrowserContainer::CanHandleContent(const char *aContentType, nsURILoadCommand aCommand, char **aDesiredContentType, PRBool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }