diff --git a/direct/src/directutil/DistributedLargeBlobSenderAI.py b/direct/src/directutil/DistributedLargeBlobSenderAI.py
index a0212de8e5..ca075e4aeb 100755
--- a/direct/src/directutil/DistributedLargeBlobSenderAI.py
+++ b/direct/src/directutil/DistributedLargeBlobSenderAI.py
@@ -65,5 +65,5 @@ class DistributedLargeBlobSenderAI(DistributedObjectAI.DistributedObjectAI):
 
     def setAck(self):
         DistributedLargeBlobSenderAI.notify.debug('setAck')
-        assert self.air.msgSender == self.targetAvId
+        assert self.air.GetAvatarIDFromSender() == self.targetAvId
         self.requestDelete()
diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py
index 50a95242ab..3fd76f4eaa 100644
--- a/direct/src/distributed/ClientRepository.py
+++ b/direct/src/distributed/ClientRepository.py
@@ -809,6 +809,7 @@ class ClientRepository(ConnectionRepository.ConnectionRepository):
             print "ClientRepository received datagram:"
             di.getDatagram().dumpHex(ostream)
             
+                        
         msgType = self.getMsgType()
 
         if not wantOtpServer:
diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py
index 294201f480..51bfa45160 100644
--- a/direct/src/distributed/ConnectionRepository.py
+++ b/direct/src/distributed/ConnectionRepository.py
@@ -354,8 +354,9 @@ class ConnectionRepository(DoInterestManager, CConnectionRepository):
         if self.notify.getDebug():
             print "ConnectionRepository sending datagram:"
             datagram.dumpHex(ostream)
-
+            
         self.sendDatagram(datagram)
+        
 
 
     # debugging funcs for simulating a network-plug-pull
diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py
index 2904785e35..9d6e1ab96f 100644
--- a/direct/src/distributed/DistributedObjectAI.py
+++ b/direct/src/distributed/DistributedObjectAI.py
@@ -228,6 +228,12 @@ class DistributedObjectAI(DirectObject.DirectObject):
         def GetPuppetConnectionChannel(self, doId):
             return doId + ( 1L << 32);
 
+        def GetAccountIDFromChannelCode(self, channel):
+            return (channel >> 32)
+
+        def GetAvatarIDFromChannelCode(self, channel):
+            return (channel  & 0xffffffffL)
+
         def sendUpdateToAvatarId(self, avId, fieldName, args):
             assert self.notify.debugStateCall(self)
             channelId = self.GetPuppetConnectionChannel(avId)
@@ -426,7 +432,7 @@ class DistributedObjectAI(DirectObject.DirectObject):
     def setBarrierReady(self, context):
         # Generated by the clients to check in after a beginBarrier()
         # call.
-        avId = self.air.msgSender
+        avId = self.air.GetAvatarIDFromSender()
         assert(self.notify.debug('setBarrierReady(%s, %s)' % (context, avId)))
         barrier = self.__barriers.get(context)
         if barrier == None: