diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h
index c3a4c4592adbd093fbf4ce94a70d14256514723d..a7e99c2d0993520cbebcfcf2608323133c5c892c 100644
--- a/indra/llcommon/llregistry.h
+++ b/indra/llcommon/llregistry.h
@@ -59,7 +59,7 @@ public:
 
 		bool add(ref_const_key_t key, ref_const_value_t value)
 		{
-			if (mMap.insert(std::make_pair(key, value)).second == false)
+			if (mMap.emplace(key, value).second == false)
 			{
 				LL_WARNS() << "Tried to register " << key << " but it was already registered!" << LL_ENDL;
 				return false;
@@ -91,7 +91,7 @@ public:
 		ptr_value_t getValue(ref_const_key_t key)
 		{
 			typename registry_map_t::iterator found_it = mMap.find(key);
-			if (found_it != mMap.end())
+			if (found_it != mMap.cend())
 			{
 				return &(found_it->second);
 			}
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index d0c302de4f6ff938d8872196cdc89a0a95648bb2..8f8bd8e0aa53bbbb1d2d1da915215e7638a60c57 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1061,7 +1061,7 @@ GLuint LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_lev
 	if (ret)
 	{
 		// Add shader file to map
-		mShaderObjects.insert(make_pair(filename, CachedShaderObject(ret, try_gpu_class, type, texture_index_channels, defines)));
+		mShaderObjects.emplace(filename, CachedShaderObject(ret, try_gpu_class, type, texture_index_channels, defines));
 		shader_level = try_gpu_class;
 	}
 	else
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index d891281e3fa177fd5bbad9b0a8eace1af0b9bd67..4bdef7b1226dd28bdb9222580833d5537794fc5b 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -286,7 +286,7 @@ void LLUIColorTable::setColor(const std::string& name, const LLColor4& color, st
 	}
 	else
 	{
-		table.insert(string_color_map_t::value_type(name, color));
+		table.emplace(name, color);
 	}
 }
 
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 109fb45d401f42f6198559f4345698a1a9aec181..a5e8b9376b3b56bad0108be71d070d3445dc9f2b 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -206,7 +206,7 @@ BOOL LLView::isPanel() const
 void LLView::setToolTip(const LLStringExplicit& msg)
 {
     // <alchemy>
-    if (msg.size())
+    if (!msg.empty())
     {
         mToolTipMsg = std::make_unique<char[]>(msg.size() + 1);
         std::strncpy(mToolTipMsg.get(), msg.c_str(), msg.size() + 1);