diff --git a/indra/llui/llchat.h b/indra/llui/llchat.h
index 746103b9115590a9cc9400931457848ee79f57f1..a422b64e5254feeaf061ce0adad9a4e23e5b5e3a 100644
--- a/indra/llui/llchat.h
+++ b/indra/llui/llchat.h
@@ -71,8 +71,8 @@ typedef enum e_chat_style
 class LLChat
 {
 public:
-	LLChat(const std::string& text = std::string())
-	:	mText(text),
+	LLChat(std::string text = std::string())
+	:	mText(std::move(text)),
 		mFromName(),
 		mFromID(),
 		mNotifId(),
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 999c50376beac201c7979184104e1598ea09009f..91cdef420ac44fc9ee26dc31423027a31c574d93 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -494,8 +494,7 @@ void LLFolderViewItem::rename(const std::string& new_name)
 
 const std::string& LLFolderViewItem::getName( void ) const
 {
-	static const std::string noName("");
-	return getViewModelItem() ? getViewModelItem()->getName() : noName;
+	return getViewModelItem() ? getViewModelItem()->getName() : LLStringUtil::null;
 }
 
 // LLView functionality
diff --git a/indra/llui/lltrans.cpp b/indra/llui/lltrans.cpp
index 1fb48181f179e0b8f390262bbbc47b5a23b5d8b8..8ac3ca0df360acb7dbdc5d5d99da936d851521f0 100644
--- a/indra/llui/lltrans.cpp
+++ b/indra/llui/lltrans.cpp
@@ -344,7 +344,7 @@ std::string LLTrans::getCountString(const std::string_view language, const std::
 	return getString(key, args);
 }
 
-void LLTrans::setDefaultArg(const std::string& name, const std::string value)
+void LLTrans::setDefaultArg(const std::string& name, std::string value)
 {
 	sDefaultArgs[name] = std::move(value);
 }
diff --git a/indra/llui/lltrans.h b/indra/llui/lltrans.h
index 329189a3585c410cd5c20c22fdde9dd93c865194..16c690fad9e1ace8bbca9ae69e060b58c06781e4 100644
--- a/indra/llui/lltrans.h
+++ b/indra/llui/lltrans.h
@@ -117,7 +117,7 @@ class LLTrans
 		return sDefaultArgs;
 	}
 
-	static void setDefaultArg(const std::string& name, const std::string value);
+	static void setDefaultArg(const std::string& name, std::string value);
 
 	// insert default args into an arg list
 	static void getArgs(LLStringUtil::format_map_t& args)
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 8b1b401b71ece3cd905624e85c03257070bf2beb..b1a197ec6cd641b0a7bb3bfb10ec265244337b0f 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -176,7 +176,7 @@ void LLUrlEntryBase::callObservers(const std::string &id,
 bool LLUrlEntryBase::isLinkDisabled() const
 {
 	// this allows us to have a global setting to turn off text hyperlink highlighting/action
-	static LLCachedControl<bool> globally_disabled(*LLUI::getInstance()->mSettingGroups["config"], "DisableTextHyperlinkActions", false);
+	static LLUICachedControl<bool> globally_disabled("DisableTextHyperlinkActions", false);
 
 	return globally_disabled;
 }
diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp
index d9e91ad5ed12bdc93ca261551f1b8c62d1e8f877..a7e21b10a7753dd0a380582b301784ee8a977bde 100644
--- a/indra/newview/llinspect.cpp
+++ b/indra/newview/llinspect.cpp
@@ -45,8 +45,8 @@ LLInspect::~LLInspect()
 // virtual
 void LLInspect::draw()
 {
-	static LLCachedControl<F32> FADE_TIME(*LLUI::getInstance()->mSettingGroups["config"], "InspectorFadeTime", 1.f);
-	static LLCachedControl<F32> STAY_TIME(*LLUI::getInstance()->mSettingGroups["config"], "InspectorShowTime", 1.f);
+	static LLUICachedControl<F32> FADE_TIME("InspectorFadeTime", 1.f);
+	static LLUICachedControl<F32> STAY_TIME("InspectorShowTime", 1.f);
 	if (mOpenTimer.getStarted())
 	{
 		LLFloater::draw();
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 5a59894709f9eed962bac00ec90ac576bc75d622..5a7f28abe0d6ed9097e9be99386c371417f3c7bd 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1736,7 +1736,7 @@ LLUIImagePtr LLUIImageList::loadUIImage(LLViewerFetchedTexture* imagep, const st
 		// Don't add downloadable content into this list
 		// all UI images are non-deletable and list does not support deletion
 		imagep->setNoDelete();
-		mUIImages.insert(std::make_pair(name, new_imagep));
+		mUIImages.emplace(name, new_imagep);
 		mUITextureList.push_back(imagep);
 	}