diff --git a/mozilla/lib/plugin/npglue.cpp b/mozilla/lib/plugin/npglue.cpp
index d3ac1d0405b..092960a0934 100644
--- a/mozilla/lib/plugin/npglue.cpp
+++ b/mozilla/lib/plugin/npglue.cpp
@@ -4442,11 +4442,11 @@ NPL_GetOJIPluginInstance(NPEmbeddedApp *embed)
 
 
 // Used by layout code to get to a text representing a java bean.
-PR_IMPLEMENT(char *)
+PR_IMPLEMENT(const char *)
 NPL_GetText(struct nsIPluginInstance *psNPIT)
 {
    nsIPluginInstance *pNPIT = (nsIPluginInstance *)psNPIT;
-   char *text = NULL;
+   const char *text = NULL;
 
    nsIJVMPluginInstance  *pJVMPIT = NULL;
    NS_DEFINE_IID(kJvmPluginInstanceIID, NS_IJVMPLUGININSTANCE_IID);
diff --git a/mozilla/lib/plugin/nsIPlug.h b/mozilla/lib/plugin/nsIPlug.h
index aeb278d344d..1404a47628a 100644
--- a/mozilla/lib/plugin/nsIPlug.h
+++ b/mozilla/lib/plugin/nsIPlug.h
@@ -447,6 +447,10 @@ public:
     NS_IMETHOD_(nsPluginError)
     Initialize(nsIPluginInstancePeer* peer) = 0;
 
+    // Required backpointer to the peer.
+    NS_IMETHOD_(nsIPluginInstancePeer*)
+    GetPeer(void) = 0;
+
     // See comment for nsIPlugin::CreateInstance, above.
     NS_IMETHOD_(nsPluginError)
     Start(void) = 0;
diff --git a/mozilla/modules/oji/src/nsIJVM.h b/mozilla/modules/oji/src/nsIJVM.h
index c96fe62b700..5e9226359c7 100644
--- a/mozilla/modules/oji/src/nsIJVM.h
+++ b/mozilla/modules/oji/src/nsIJVM.h
@@ -246,14 +246,11 @@ public:
     NS_IMETHOD_(jobject) 
     GetJavaObject(void) = 0;
 
-    NS_IMETHOD_(nsIPluginInstancePeer2 *)
-    GetPeer(void) = 0;
-
     /* =-= sudu: Ask Eric Bina, what is GetText used for in layform.c
                  Check to see if this should be more general api applicaple to
                  applets/beans and plugins.
     */
-    NS_IMETHOD_(char *)
+    NS_IMETHOD_(const char*)
     GetText(void) = 0;
 };