diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp
index 74b731fdc5..2f031a6f0a 100644
--- a/avatar-mixer/src/main.cpp
+++ b/avatar-mixer/src/main.cpp
@@ -88,15 +88,12 @@ int main(int argc, const char* argv[]) {
                     
                     // send back a packet with other active agent data to this agent
                     for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
-                        if (agent->getLinkedData() != NULL
-                            && !socketMatch(agentAddress, agent->getActiveSocket())) {
+                        if (agent->getLinkedData() && !socketMatch(agentAddress, agent->getActiveSocket())) {
                             currentBufferPosition = addAgentToBroadcastPacket(currentBufferPosition, &*agent);
                         }
                     }
                     
-                    agentList->getAgentSocket().send(agentAddress,
-                                                    broadcastPacket,
-                                                    currentBufferPosition - broadcastPacket);
+                    agentList->getAgentSocket().send(agentAddress, broadcastPacket, currentBufferPosition - broadcastPacket);
                     
                     break;
                 case PACKET_HEADER_DOMAIN:
diff --git a/eve/src/main.cpp b/eve/src/main.cpp
index 7c4bde7a2d..b8025d5dd8 100644
--- a/eve/src/main.cpp
+++ b/eve/src/main.cpp
@@ -52,7 +52,7 @@ void *receiveAgentData(void *args) {
                     // avatar mixer - this makes sure it won't be killed during silent agent removal
                     avatarMixer = agentList->soloAgentOfType(AGENT_TYPE_AVATAR_MIXER);
                     
-                    if (avatarMixer != NULL) {
+                    if (avatarMixer) {
                         avatarMixer->setLastHeardMicrostamp(usecTimestampNow());
                     }
                     
@@ -77,9 +77,9 @@ void *injectAudio(void *args) {
     // look for an audio mixer in our agent list
     Agent* audioMixer = AgentList::getInstance()->soloAgentOfType(AGENT_TYPE_AUDIO_MIXER);
     
-    if (audioMixer != NULL) {
+    if (audioMixer) {
         // until the audio mixer is setup for ping-reply, activate the public socket if it's not active
-        if (audioMixer->getActiveSocket() == NULL) {
+        if (!audioMixer->getActiveSocket()) {
             audioMixer->activatePublicSocket();
         }
         
@@ -117,9 +117,9 @@ int main(int argc, const char* argv[]) {
     // move eve away from the origin
     // pick a random point inside a 10x10 grid
     
-    eve.setPosition(glm::vec3(randFloatInRange(-RANDOM_POSITION_MAX_DIMENSION, RANDOM_POSITION_MAX_DIMENSION), 
+    eve.setPosition(glm::vec3(randFloatInRange(0, RANDOM_POSITION_MAX_DIMENSION),
                               1.33, // this should be the same as the avatar's pelvis standing height 
-                              randFloatInRange(-RANDOM_POSITION_MAX_DIMENSION, RANDOM_POSITION_MAX_DIMENSION)));
+                              randFloatInRange(0, RANDOM_POSITION_MAX_DIMENSION)));
     
     // face any instance of eve down the z-axis
     eve.setBodyYaw(0);
diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp
index 82a21ae479..0ff8184f07 100644
--- a/libraries/shared/src/AgentList.cpp
+++ b/libraries/shared/src/AgentList.cpp
@@ -123,7 +123,7 @@ void AgentList::processBulkAgentData(sockaddr *senderAddress, unsigned char *pac
     uint16_t agentID = -1;
     
     while ((currentPosition - startPosition) < numTotalBytes) {
-        currentPosition += unpackAgentId(currentPosition, &agentID);
+        unpackAgentId(currentPosition, &agentID);
         memcpy(packetHolder + 1, currentPosition, numTotalBytes - (currentPosition - startPosition));
         
         Agent* matchingAgent = agentWithID(agentID);