diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
index 6ada179ce..62273b719 100644
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -175,13 +175,13 @@ int AICachedPointerPtr<KEY, T>::sCnt;
 namespace LLKeyframeMotionLerp
 {
 	template<typename T>
-	T lerp(F32 t, const T& before, const T& after)
+	inline T lerp(F32 t, const T& before, const T& after)
 	{
 		return ::lerp(before, after, t);
 	}
 
 	template<>
-	LLQuaternion lerp(F32 t, const LLQuaternion& before, const LLQuaternion& after)
+	inline LLQuaternion lerp(F32 t, const LLQuaternion& before, const LLQuaternion& after)
 	{
 		return ::nlerp(t, before, after);
 	}
diff --git a/indra/newview/llhudnametag.cpp b/indra/newview/llhudnametag.cpp
index d57ae3006..3d712439a 100644
--- a/indra/newview/llhudnametag.cpp
+++ b/indra/newview/llhudnametag.cpp
@@ -1056,6 +1056,7 @@ void LLHUDNameTag::reshape()
 
 F32 LLHUDNameTag::LLHUDTextSegment::getWidth(const LLFontGL* font)
 {
+	// Singu note: Reworked hotspot. Less indirection
 	if (mFontWidthMap[0].first == font)
 	{
 		return mFontWidthMap[0].second;