diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 4a271b1f92..76bd0de810 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -68,6 +68,7 @@ RenderShadowDetail			1	2
 RenderUseStreamVBO			1	1
 RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
+RenderMirrors				1	1
 RenderGLContextCoreProfile         1   1
 RenderGLMultiThreadedTextures      1   0
 RenderGLMultiThreadedMedia         1   1
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index a3d3d122d2..53bb4a193c 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -247,7 +247,7 @@ RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	1
 RenderScreenSpaceReflections 1  0
 RenderReflectionProbeLevel  1   1
-RenderMirrors				1	1
+RenderMirrors				1	0
 RenderHeroProbeResolution	1	512
 RenderHeroProbeDistance		1	8
 RenderHeroProbeUpdateRate	1	2
diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index b19e8ad16f..2bf2f924fc 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -84,13 +84,13 @@ FSFloaterContacts::FSFloaterContacts(const LLSD& seed)
 {
     LLAvatarTracker::instance().addObserver(this);
     // For notification when SIP online status changes.
-    LLVoiceClient::getInstance()->addObserver(this);
+    LLVoiceClient::addObserver(this);
 }
 
 FSFloaterContacts::~FSFloaterContacts()
 {
     // For notification when SIP online status changes.
-    LLVoiceClient::getInstance()->removeObserver(this);
+    LLVoiceClient::removeObserver(this);
     LLAvatarTracker::instance().removeObserver(this);
 
     if (mRlvBehaviorCallbackConnection.connected())
diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index fc176e3dc0..560c39b354 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -235,10 +235,7 @@ void FSFloaterIM::onClose(bool app_quitting)
 
     // AO: Make sure observers are removed on close
     mVoiceChannelStateChangeConnection.disconnect();
-    if(LLVoiceClient::instanceExists())
-    {
-        LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this);
-    }
+    LLVoiceClient::removeObserver((LLVoiceClientStatusObserver*)this);
 
     //<FS:ND> FIRE-6077 et al: Always clean up observers when the floater dies
     LLAvatarTracker::instance().removeParticularFriendObserver(mOtherParticipantUUID, this);
@@ -616,10 +613,7 @@ FSFloaterIM::~FSFloaterIM()
 
     LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, (LLView*)this);
     mVoiceChannelStateChangeConnection.disconnect();
-    if (LLVoiceClient::instanceExists())
-    {
-        LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this);
-    }
+    LLVoiceClient::removeObserver((LLVoiceClientStatusObserver*)this);
 
     LLIMModel::LLIMSession* pIMSession = LLIMModel::instance().findIMSession(mSessionID);
     if ((pIMSession) && (pIMSession->mSessionType == LLIMModel::LLIMSession::P2P_SESSION))
@@ -961,7 +955,7 @@ bool FSFloaterIM::postBuild()
         updateButtons(mVoiceChannel->getState() >= LLVoiceChannel::STATE_CALL_STARTED);
         LL_DEBUGS("FSFloaterIM") << "voice_channel end" << LL_ENDL;
     }
-    LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this);
+    LLVoiceClient::addObserver((LLVoiceClientStatusObserver*)this);
 
     // </AO>
 
diff --git a/indra/newview/fsfloatervoicecontrols.cpp b/indra/newview/fsfloatervoicecontrols.cpp
index 71e2df24ef..1a31763f83 100644
--- a/indra/newview/fsfloatervoicecontrols.cpp
+++ b/indra/newview/fsfloatervoicecontrols.cpp
@@ -79,7 +79,7 @@ FSFloaterVoiceControls::FSFloaterVoiceControls(const LLSD& key)
     static LLUICachedControl<S32> voice_left_remove_delay ("VoiceParticipantLeftRemoveDelay", 10);
     mSpeakerDelayRemover = new LLSpeakersDelayActionsStorage(boost::bind(&FSFloaterVoiceControls::removeVoiceLeftParticipant, this, _1), (F32)voice_left_remove_delay);
 
-    LLVoiceClient::instance().addObserver(this);
+    LLVoiceClient::addObserver(this);
     LLTransientFloaterMgr::getInstance()->addControlView(this);
 
     // update the agent's name if display name setting change
@@ -99,10 +99,7 @@ FSFloaterVoiceControls::~FSFloaterVoiceControls()
     mAvatarListRefreshConnection.disconnect();
     mVoiceChannelStateChangeConnection.disconnect();
 
-    if(LLVoiceClient::instanceExists())
-    {
-        LLVoiceClient::getInstance()->removeObserver(this);
-    }
+    LLVoiceClient::removeObserver(this);
     LLTransientFloaterMgr::getInstance()->removeControlView(this);
 }
 
@@ -513,13 +510,12 @@ void FSFloaterVoiceControls::updateAgentModeratorState()
 static void get_voice_participants_uuids(uuid_vec_t& speakers_uuids)
 {
     // Get a list of participants from VoiceClient
-       std::set<LLUUID> participants;
-       LLVoiceClient::getInstance()->getParticipantList(participants);
+    std::set<LLUUID> participants;
+    LLVoiceClient::getInstance()->getParticipantList(participants);
 
-    for (std::set<LLUUID>::const_iterator iter = participants.begin();
-         iter != participants.end(); ++iter)
+    for (const auto& speaker_uuid : participants)
     {
-        speakers_uuids.push_back(*iter);
+        speakers_uuids.emplace_back(speaker_uuid);
     }
 
 }
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index d14be19760..69fe345e42 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -627,7 +627,6 @@ LLPanelPeople::~LLPanelPeople()
     mGroupsFilterCommitConnection.disconnect();
     mRecentFilterCommitConnection.disconnect();
 
-
     // [FS:CR] Contact sets
     if (mContactSetChangedConnection.connected())
         mContactSetChangedConnection.disconnect();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index de4bf32a44..d88f5626b4 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -103,13 +103,7 @@
 #include "llmutelist.h"
 #include "lltoolpie.h"
 #include "llnotifications.h"
-// <FS:Beq> hacky BOOL workaround
-#ifndef BOOL
-#define BOOL bool
-#endif
-// </FS:Beq>
 #include "llpathinglib.h"
-#undef BOOL // <FS:Beq/> hacky BOOL workaround
 #include "llfloaterpathfindingconsole.h"
 #include "llfloaterpathfindingcharacters.h"
 #include "llfloatertools.h"