diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
index f4416574caf9583ada51ee825f114f2ce7d646e2..04e9ef9dfb3fe2b63b90a9b20555f4ce24b4ef08 100644
--- a/indra/llui/llfloaterreg.h
+++ b/indra/llui/llfloaterreg.h
@@ -101,7 +101,7 @@ class LLFloaterReg
 	}
 	
 	static void add(const std::string& name, const std::string& file, const LLFloaterBuildFunc& func,
-					const std::string& groupname = LLStringUtil::null);
+					const std::string& groupname = std::string());
 
 	// Helpers
 	static LLFloater* getLastFloaterInGroup(std::string_view name);
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 04cb683622b573cbf94bd3079de998aad6ac01ad..793354cb1fbde20cad65079d871c28b93faee3be 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -164,7 +164,7 @@ std::string LLKeywords::getArguments(LLSD& arguments)
 std::string LLKeywords::getAttribute(const std::string& key)
 {
 	attribute_iterator_t it = mAttributes.find(key);
-	return (it != mAttributes.end()) ? it->second : "";
+	return (it != mAttributes.end()) ? it->second : std::string();
 }
 
 LLColor4 LLKeywords::getColorGroup(const std::string& key_in)