diff --git a/evennia/server/amp.py b/evennia/server/amp.py
index 20c18456d0..7e513399eb 100644
--- a/evennia/server/amp.py
+++ b/evennia/server/amp.py
@@ -145,7 +145,7 @@ class MsgPortal2Server(amp.Command):
     Message portal -> server
     """
     key = "MsgPortal2Server"
-    arguments = [('hashid', amp.Integer()),
+    arguments = [('hashid', amp.String()),
                  ('data', amp.String()),
                  ('ipart', amp.Integer()),
                  ('nparts', amp.Integer())]
@@ -158,7 +158,7 @@ class MsgServer2Portal(amp.Command):
     Message server -> portal
     """
     key = "MsgServer2Portal"
-    arguments = [('hashid', amp.Integer()),
+    arguments = [('hashid', amp.String()),
                  ('data', amp.String()),
                  ('ipart', amp.Integer()),
                  ('nparts', amp.Integer())]
@@ -175,7 +175,7 @@ class ServerAdmin(amp.Command):
      session connects or resyncs
     """
     key = "ServerAdmin"
-    arguments = [('hashid', amp.Integer()),
+    arguments = [('hashid', amp.String()),
                  ('data', amp.String()),
                  ('ipart', amp.Integer()),
                  ('nparts', amp.Integer())]
@@ -191,7 +191,7 @@ class PortalAdmin(amp.Command):
      operations on the portal.
     """
     key = "PortalAdmin"
-    arguments = [('hashid', amp.Integer()),
+    arguments = [('hashid', amp.String()),
                  ('data', amp.String()),
                  ('ipart', amp.Integer()),
                  ('nparts', amp.Integer())]
@@ -238,6 +238,17 @@ class AMPProtocol(amp.AMP):
 
     # helper methods
 
+    def __init__(self, *args, **kwargs):
+        """
+        Initialize protocol with some things that need to be
+        in place already before connecting both on portal and server.
+        """
+        self.min_batch_step = 1.0 / BATCH_RATE
+        self.lastsend = time()
+        self.task = task.LoopingCall(self.batch_send, MsgPortal2Server, None)
+        self.task.start(BATCH_TIMEOUT)
+
+
     def connectionMade(self):
         """
         This is called when a connection is established
@@ -255,11 +266,6 @@ class AMPProtocol(amp.AMP):
             self.factory.portal.sessions.at_server_connection()
             if hasattr(self.factory, "server_restart_mode"):
                 del self.factory.server_restart_mode
-        # should be set both on portal and server
-        self.min_batch_step = 1.0 / BATCH_RATE
-        self.lastsend = time()
-        self.task = task.LoopingCall(self.batch_send, MsgPortal2Server, None)
-        self.task.start(BATCH_TIMEOUT)
 
     # Error handling
 
@@ -274,15 +280,16 @@ class AMPProtocol(amp.AMP):
         This will batch data together to send fewer, large batches.
         """
         global _SENDBATCH
+        cmdkey = command.key
         if sessid is not None:
-            _SENDBATCH.append((sessid, kwargs))
+            _SENDBATCH[cmdkey].append((sessid, kwargs))
         if not _SENDBATCH:
             return
         now = time()
 
         if now - self.lastsend > self.min_batch_step:
-            batch = dumps(_SENDBATCH)
-            _SENDBATCH = []
+            batch = dumps(_SENDBATCH[cmdkey])
+            _SENDBATCH[cmdkey] = []
             to_send = [batch[i:i+AMP_MAXLEN] for i in range(0, len(batch), AMP_MAXLEN)]
             nparts = len(to_send)
             # tag this batch
@@ -339,7 +346,7 @@ class AMPProtocol(amp.AMP):
         data comes in multiple chunks; if so (nparts>1) we buffer the data
         and wait for the remaining parts to arrive before continuing.
         """
-        batch = self.batch_recv(MsgPortal2Server, hashid, data, ipart, nparts)
+        batch = self.batch_recv(hashid, data, ipart, nparts)
         for (sessid, kwargs) in batch:
             #print "msg portal -> server (server side):", sessid, msg, loads(ret["data"])
             self.factory.server.sessions.data_in(sessid,
@@ -487,7 +494,7 @@ class AMPProtocol(amp.AMP):
         """
         Access method called by the server side.
         """
-        return self.batch_send(PortalAdmin, sessid, operation=operation, data=dumps(data))
+        return self.batch_send(PortalAdmin, sessid, operation=operation, data=data)
 
     # Extra functions