diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 74fccc50c4..704200d24c 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -442,7 +442,7 @@ void updateAvatar(float frametime) {
         endOfBroadcastStringWrite += myAvatar.getBroadcastData(endOfBroadcastStringWrite);
         
         const char broadcastReceivers[2] = {AGENT_TYPE_VOXEL, AGENT_TYPE_AVATAR_MIXER};
-        AgentList::getInstance()->broadcastToAgents(broadcastString, endOfBroadcastStringWrite - broadcastString, broadcastReceivers, 2);
+        AgentList::getInstance()->broadcastToAgents(broadcastString, endOfBroadcastStringWrite - broadcastString, broadcastReceivers, sizeof(broadcastReceivers));
     }
 
     // If I'm in paint mode, send a voxel out to VOXEL server agents.
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index bd866091a0..3136b3e30a 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -129,7 +129,7 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
 int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
 
     // increment to push past the packet header and agent ID
-    sourceBuffer += 3;
+    sourceBuffer += sizeof(PACKET_HEADER_HEAD_DATA) + sizeof(uint16_t);
     
     unsigned char* startPosition = sourceBuffer;