diff --git a/src/server/amp.py b/src/server/amp.py
index 1f47eff0e..528aa0bab 100644
--- a/src/server/amp.py
+++ b/src/server/amp.py
@@ -303,18 +303,18 @@ class AMPProtocol(amp.AMP):
         return {}
     MsgPortal2Server.responder(amp_msg_portal2server)
 
-    def call_remote_MsgPortal2Server(self, sessid, msg, **kwargs):
+    def call_remote_MsgPortal2Server(self, sessid, msg, data=""):
         """
         Access method called by the Portal and executed on the Portal.
         """
-        #print "msg portal->server (portal side):", sessid, msg
+        #print "msg portal->server (portal side):", sessid, msg, data
         try:
             return self.callRemote(MsgPortal2Server,
                             sessid=sessid,
                             msg=msg,
                             ipart=0,
                             nparts=1,
-                            data=dumps(kwargs)).addErrback(self.errback, "MsgPortal2Server")
+                            data=dumps(data)).addErrback(self.errback, "MsgPortal2Server")
         except amp.TooLong:
             # the msg (or data) was too long for AMP to send. We need to send in blocks.
             return self.send_split_msg(sessid, msg, kwargs, MsgPortal2Server)
@@ -343,18 +343,18 @@ class AMPProtocol(amp.AMP):
         return {}
     MsgServer2Portal.responder(amp_msg_server2portal)
 
-    def call_remote_MsgServer2Portal(self, sessid, msg, **kwargs):
+    def call_remote_MsgServer2Portal(self, sessid, msg, data=""):
         """
         Access method called by the Server and executed on the Server.
         """
-        #print "msg server->portal (server side):", sessid, msg, kwargs
+        #print "msg server->portal (server side):", sessid, msg, data
         try:
             return self.callRemote(MsgServer2Portal,
                             sessid=sessid,
                             msg=to_str(msg),
                             ipart=0,
                             nparts=1,
-                            data=dumps(kwargs)).addErrback(self.errback, "MsgServer2Portal")
+                            data=dumps(data)).addErrback(self.errback, "MsgServer2Portal")
         except amp.TooLong:
             # the msg (or data) was too long for AMP to send. We need to send in blocks.
             return self.send_split_msg(sessid, msg, kwargs, MsgServer2Portal)
diff --git a/src/utils/idmapper/base.py b/src/utils/idmapper/base.py
index 2cee15192..b29c39903 100755
--- a/src/utils/idmapper/base.py
+++ b/src/utils/idmapper/base.py
@@ -134,8 +134,7 @@ class SharedMemoryModelBase(ModelBase):
             fget = lambda cls: _get(cls, fieldname)
             fset = lambda cls, val: _set(cls, fieldname, val) if editable else _set_nonedit(cls, fieldname, val)
             fdel = lambda cls: _del(cls, fieldname) if editable else _del_nonedit(cls,fieldname)
-            doc = "Wraps setting, saving and deleting the %s field." % fieldname
-            type(cls).__setattr__(cls, wrappername, property(fget, fset, fdel, doc))
+            type(cls).__setattr__(cls, wrappername, property(fget, fset, fdel))
 
         # exclude some models that should not auto-create wrapper fields
         if cls.__name__ in ("ServerConfig", "TypeNick"):