diff --git a/gvr-interface/src/Client.cpp b/gvr-interface/src/Client.cpp
index 6247b07f0f..7c4184bfbb 100644
--- a/gvr-interface/src/Client.cpp
+++ b/gvr-interface/src/Client.cpp
@@ -54,13 +54,8 @@ void Client::setupNetworking() {
 
 void Client::processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket) {
     PacketType incomingType = packetTypeForPacket(incomingPacket);
-    // only process this packet if we have a match on the packet version
-    switch (incomingType) {
-        default:
-            auto nodeList = DependencyManager::get<NodeList>();
-            nodeList->processNodeData(senderSockAddr, incomingPacket);
-            break;
-    }
+    
+    DependencyManager::get<NodeList>()->processNodeData(senderSockAddr, incomingPacket);
 }
 
 void Client::processDatagrams() {
diff --git a/gvr-interface/src/RenderingClient.cpp b/gvr-interface/src/RenderingClient.cpp
index 6431ece950..e0416fd532 100644
--- a/gvr-interface/src/RenderingClient.cpp
+++ b/gvr-interface/src/RenderingClient.cpp
@@ -82,56 +82,59 @@ RenderingClient::~RenderingClient() {
 void RenderingClient::processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket) {
     auto nodeList = DependencyManager::get<NodeList>();
     PacketType incomingType = packetTypeForPacket(incomingPacket);
-    // only process this packet if we have a match on the packet version
-    switch (incomingType) {
-        case PacketTypeAudioEnvironment:
-        case PacketTypeAudioStreamStats:
-        case PacketTypeMixedAudio:
-        case PacketTypeSilentAudioFrame: {
+    
+    if (nodeList->packetVersionAndHashMatch(incomingPacket)) {
+        // only process this packet if we have a match on the packet version
+        switch (incomingType) {
+            case PacketTypeAudioEnvironment:
+            case PacketTypeAudioStreamStats:
+            case PacketTypeMixedAudio:
+            case PacketTypeSilentAudioFrame: {
             
-            if (incomingType == PacketTypeAudioStreamStats) {
-                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioStreamStatsPacket",
-                                          Qt::QueuedConnection,
-                                          Q_ARG(QByteArray, incomingPacket));
-            } else if (incomingType == PacketTypeAudioEnvironment) {
-                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioEnvironmentData",
-                                          Qt::QueuedConnection,
-                                          Q_ARG(QByteArray, incomingPacket));
-            } else {
-                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "addReceivedAudioToStream",
-                                          Qt::QueuedConnection,
-                                          Q_ARG(QByteArray, incomingPacket));
+                if (incomingType == PacketTypeAudioStreamStats) {
+                    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioStreamStatsPacket",
+                                              Qt::QueuedConnection,
+                                              Q_ARG(QByteArray, incomingPacket));
+                } else if (incomingType == PacketTypeAudioEnvironment) {
+                    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioEnvironmentData",
+                                              Qt::QueuedConnection,
+                                              Q_ARG(QByteArray, incomingPacket));
+                } else {
+                    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "addReceivedAudioToStream",
+                                              Qt::QueuedConnection,
+                                              Q_ARG(QByteArray, incomingPacket));
+                }
+            
+                // update having heard from the audio-mixer and record the bytes received
+                SharedNodePointer audioMixer = nodeList->sendingNodeForPacket(incomingPacket);
+            
+                if (audioMixer) {
+                    audioMixer->setLastHeardMicrostamp(usecTimestampNow());
+                }
+            
+                break;
             }
+            case PacketTypeBulkAvatarData:
+            case PacketTypeKillAvatar:
+            case PacketTypeAvatarIdentity:
+            case PacketTypeAvatarBillboard: {
+                // update having heard from the avatar-mixer and record the bytes received
+                SharedNodePointer avatarMixer = nodeList->sendingNodeForPacket(incomingPacket);
             
-            // update having heard from the audio-mixer and record the bytes received
-            SharedNodePointer audioMixer = nodeList->sendingNodeForPacket(incomingPacket);
-            
-            if (audioMixer) {
-                audioMixer->setLastHeardMicrostamp(usecTimestampNow());
-            }
-            
-            break;
-        }
-        case PacketTypeBulkAvatarData:
-        case PacketTypeKillAvatar:
-        case PacketTypeAvatarIdentity:
-        case PacketTypeAvatarBillboard: {
-            // update having heard from the avatar-mixer and record the bytes received
-            SharedNodePointer avatarMixer = nodeList->sendingNodeForPacket(incomingPacket);
-            
-            if (avatarMixer) {
-                avatarMixer->setLastHeardMicrostamp(usecTimestampNow());
+                if (avatarMixer) {
+                    avatarMixer->setLastHeardMicrostamp(usecTimestampNow());
                 
-                QMetaObject::invokeMethod(DependencyManager::get<AvatarHashMap>().data(),
-                                          "processAvatarMixerDatagram",
-                                          Q_ARG(const QByteArray&, incomingPacket),
-                                          Q_ARG(const QWeakPointer<Node>&, avatarMixer));
+                    QMetaObject::invokeMethod(DependencyManager::get<AvatarHashMap>().data(),
+                                              "processAvatarMixerDatagram",
+                                              Q_ARG(const QByteArray&, incomingPacket),
+                                              Q_ARG(const QWeakPointer<Node>&, avatarMixer));
+                }
+                break;
             }
-            break;
+            default:
+                Client::processVerifiedPacket(senderSockAddr, incomingPacket);
+                break;
         }
-        default:
-            Client::processVerifiedPacket(senderSockAddr, incomingPacket);
-            break;
     }
 }
 
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 316496c62a..0ffcf19bf9 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -64,7 +64,7 @@ void AvatarManager::init() {
 
 void AvatarManager::updateMyAvatar(float deltaTime) {
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showWarnings, "Application::updateMyAvatar()");
+    PerformanceWarning warn(showWarnings, "AvatarManager::updateMyAvatar()");
     
     _myAvatar->update(deltaTime);