diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 793824a316bbefb8f816d484fed051637398d95e..570b0b4c19306aa5ffff6bb229752e85ddbf1088 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -216,6 +216,7 @@ bool RlvActions::canShowName(EShowNamesContext eContext, const LLUUID& idAgent)
 				return (gRlvHandler.isException(RLV_BHVR_SHOWNAMETAGS, idAgent)) || (gAgentID == idAgent);
 			// Show/hide avatar name
 			case SNC_DEFAULT:
+			case SNC_COUNT:
 			case SNC_TELEPORTOFFER:
 			case SNC_TELEPORTREQUEST:
 				return gRlvHandler.isException(RLV_BHVR_SHOWNAMES, idAgent) || (gAgentID == idAgent);
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 9ef4cb5db5a8c5b34f8a6df2e8c5eddd4f0ea87e..6ba6117e32ad3c0ebff276b7aab662629ea514e5 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -830,7 +830,8 @@ void RlvHandler::setActiveGroupRole(const LLUUID& idGroup, const std::string& st
 	// We have everything - activate the requested role (if we can find it)
 	if (pGroupData)
 	{
-		enum class EMatch { None, Partial, Exact } eMatch = EMatch::None; LLUUID idRole;
+		enum class EMatch { ENone, EPartial, EExact };
+		EMatch eMatch = EMatch::ENone; LLUUID idRole;
 		for (const auto& roleData : pGroupData->mRoles)
 		{
 			// NOTE: exact matches take precedence over partial matches; in case of partial matches the last match wins
@@ -838,13 +839,13 @@ void RlvHandler::setActiveGroupRole(const LLUUID& idGroup, const std::string& st
 			if (boost::istarts_with(strRoleName, strRole))
 			{
 				idRole = roleData.first;
-				eMatch = (strRoleName.length() == strRole.length()) ? EMatch::Exact : EMatch::Partial;
-				if (eMatch == EMatch::Exact)
+				eMatch = (strRoleName.length() == strRole.length()) ? EMatch::EExact : EMatch::EPartial;
+				if (eMatch == EMatch::EExact)
 					break;
 			}
 		}
 
-		if (eMatch != EMatch::None)
+		if (eMatch != EMatch::ENone)
 		{
 			RLV_INFOS << "Activating role '" << strRole << "' for group '" << pGroupData->mName << "'" << RLV_ENDL;
 			LLGroupMgr::getInstance()->sendGroupTitleUpdate(idGroup, idRole);
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index c66414f63e4adb92e209d15c898cb731ffd75eb1..70d50df020798ab9c7ced7a0c7590661a046631c 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -18,6 +18,7 @@
 #define RLV_HANDLER_H
 
 #include "llgroupmgr.h"
+#include "llviewertexture.h"
 #include <stack>
 
 #include "rlvcommon.h"