diff --git a/indra/llcommon/llcallstack.cpp b/indra/llcommon/llcallstack.cpp
index 8db291eed189aa7f9c3df8519c368a02139f269f..a9ccbdc60938571db1d86e985871b9735c74531c 100644
--- a/indra/llcommon/llcallstack.cpp
+++ b/indra/llcommon/llcallstack.cpp
@@ -171,9 +171,9 @@ void LLContextStrings::output(std::ostream& os)
 {
     const std::map<std::string,S32>& strings =
         LLThreadLocalSingletonPointer<LLContextStrings>::getInstance()->m_contextStrings;
-    for (std::map<std::string,S32>::const_iterator it = strings.begin(); it!=strings.end(); ++it)
+    for (const auto& string_pair : strings)
     {
-        os << it->first << "[" << it->second << "]" << "\n";
+        os << string_pair.first << "[" << string_pair.second << "]" << "\n";
     }
 }
 
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 86a4c35e6dec1ef309c370bdc2b0a40fb7dff272..ca9f5df8ab3b172c742f05d767190ce777eccef7 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -91,7 +91,7 @@ void LLFontGL::destroyGL()
 
 BOOL LLFontGL::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, S32 components, BOOL is_fallback, S32 face_n)
 {
-	if(mFontFreetype == reinterpret_cast<LLFontFreetype*>(NULL))
+	if(mFontFreetype.isNull())
 	{
 		mFontFreetype = new LLFontFreetype;
 	}
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
index b7dea9439760b1a355a989740573b7cef40d4451..07062bd8f17db2f8e55aef13ec89c48944b3cd8d 100644
--- a/indra/llui/llfloaterreg.cpp
+++ b/indra/llui/llfloaterreg.cpp
@@ -352,9 +352,8 @@ void LLFloaterReg::restoreVisibleInstances()
 	for (instance_map_t::iterator iter = sInstanceMap.begin(); iter != sInstanceMap.end(); ++iter)
 	{
 		instance_list_t& list = iter->second;
-		for (instance_list_t::iterator iter = list.begin(); iter != list.end(); ++iter)
+		for (LLFloater* floater : list)
 		{
-			LLFloater* floater = *iter;
 			floater->popVisible();
 		}
 	}