diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6fbdf3ba06..151474cb9c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -152,8 +152,8 @@ Application::Application(int& argc, char** argv) :
         _packetCount(0),
         _packetsPerSecond(0),
         _bytesPerSecond(0),
-        _bytesCount(0)  {  
-    
+        _bytesCount(0)
+{
     gettimeofday(&_applicationStartupTime, NULL);
     printLog("Interface Startup:\n");
     
@@ -169,7 +169,9 @@ Application::Application(int& argc, char** argv) :
     if (portStr) {
         listenPort = atoi(portStr);
     }
+    
     AgentList::createInstance(AGENT_TYPE_AVATAR, listenPort);
+    
     _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking");
     if (!_enableNetworkThread) {
         AgentList::getInstance()->getAgentSocket()->setBlocking(false);
diff --git a/libraries/audio/src/AudioInjectionManager.cpp b/libraries/audio/src/AudioInjectionManager.cpp
index ce252afd23..275161730e 100644
--- a/libraries/audio/src/AudioInjectionManager.cpp
+++ b/libraries/audio/src/AudioInjectionManager.cpp
@@ -9,12 +9,16 @@
 #include <sys/time.h>
 
 #include "SharedUtil.h"
+#include "AgentList.h"
+#include "AgentTypes.h"
+#include "Agent.h"
 #include "PacketHeaders.h"
 
 #include "AudioInjectionManager.h"
 
 UDPSocket* AudioInjectionManager::_injectorSocket = NULL;
 sockaddr AudioInjectionManager::_destinationSocket;
+bool AudioInjectionManager::_isDestinationSocketExplicit = false;
 AudioInjector* AudioInjectionManager::_injectors[50] = {};
 
 AudioInjector* AudioInjectionManager::injectorWithSamplesFromFile(const char* filename) {
@@ -39,9 +43,24 @@ AudioInjector* AudioInjectionManager::injectorWithCapacity(int capacity) {
     return NULL;
 }
 
+void AudioInjectionManager::setDestinationSocket(sockaddr& destinationSocket) {
+    _destinationSocket = destinationSocket;
+    _isDestinationSocketExplicit = true;
+}
+
 void* AudioInjectionManager::injectAudioViaThread(void* args) {
     AudioInjector* injector = (AudioInjector*) args;
     
+    // if we don't have an injectorSocket then grab the one from the agent list
+    if (!_injectorSocket) {
+        _injectorSocket = AgentList::getInstance()->getAgentSocket();
+    }
+    
+    // if we don't have an explicit destination socket then pull active socket for current audio mixer from agent list
+    if (!_isDestinationSocketExplicit) {
+        _destinationSocket = *AgentList::getInstance()->soloAgentOfType(AGENT_TYPE_AUDIO_MIXER)->getActiveSocket();
+    }
+    
     injector->injectAudio(_injectorSocket, &_destinationSocket);
     
     // if this an injector inside the injection manager's array we're responsible for deletion
diff --git a/libraries/audio/src/AudioInjectionManager.h b/libraries/audio/src/AudioInjectionManager.h
index 3297305475..8cb9614811 100644
--- a/libraries/audio/src/AudioInjectionManager.h
+++ b/libraries/audio/src/AudioInjectionManager.h
@@ -24,12 +24,13 @@ public:
     static void threadInjector(AudioInjector* injector);
     
     static void setInjectorSocket(UDPSocket* injectorSocket) { _injectorSocket = injectorSocket;}
-    static void setDestinationSocket(sockaddr& destinationSocket) { _destinationSocket = destinationSocket; }
+    static void setDestinationSocket(sockaddr& destinationSocket);
 private:
     static void* injectAudioViaThread(void* args);
     
     static UDPSocket* _injectorSocket;
     static sockaddr _destinationSocket;
+    static bool _isDestinationSocketExplicit;
     static AudioInjector* _injectors[MAX_CONCURRENT_INJECTORS];
 };
 
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 73157911b4..22dd33ae65 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -19,7 +19,6 @@
 using namespace std;
 using avatars_lib::printLog;
 
-
 int packFloatAngleToTwoByte(unsigned char* buffer, float angle) {
     const float ANGLE_CONVERSION_RATIO = (std::numeric_limits<uint16_t>::max() / 360.0);
     
@@ -59,7 +58,8 @@ AvatarData::AvatarData() :
     _wantColor(true),
     _wantDelta(false)
 {
-};
+    
+}
 
 int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
     unsigned char* bufferStart = destinationBuffer;
diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp
index c667f733a4..3da956a04a 100644
--- a/libraries/shared/src/AgentList.cpp
+++ b/libraries/shared/src/AgentList.cpp
@@ -10,6 +10,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <cstdio>
+
 #include "AgentList.h"
 #include "AgentTypes.h"
 #include "PacketHeaders.h"