diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c1a5f92d6..f5127e053 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5619,8 +5619,8 @@ void LLVOAvatar::processAnimationStateChanges()
 
 	stop_glerror();
 }
-/*Here's that undeform function I was talking about. -HGB
-// Bug-fixed Linden Labs style. Comment out 4ever.
+//Here's that undeform function I was talking about. -HGB
+/* Bug-fixed Linden Labs style. Comment out 4ever.
 std::string undeformers[] =
 {
 	"7a8a3dfc-acd1-7ac3-9cdf-71cd9be89969",
diff --git a/indra/newview/scriptcounter.cpp b/indra/newview/scriptcounter.cpp
index 6572d41af..a213faaf8 100644
--- a/indra/newview/scriptcounter.cpp
+++ b/indra/newview/scriptcounter.cpp
@@ -104,11 +104,11 @@ void ScriptCounter::processObjectPropertiesFamily(LLMessageSystem* msg, void** u
 	{
 		if(doDelete)
 		{
-			user_msg = llformat("Deleted %u scripts from object %s.", scriptcount, name);
+			user_msg = llformat("Deleted %u scripts from object %s.", scriptcount  , name.c_str());
 		}
 		else
 		{
-			user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name);
+			user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name.c_str());
 		}
 		reqObjectID.setNull();
 		if(countingDone)
@@ -130,11 +130,11 @@ void ScriptCounter::processObjectProperties(LLMessageSystem* msg, void** user_da
 	{
 		if(doDelete)
 		{
-			user_msg = llformat("Deleted %u scripts from object %s.", scriptcount, name);
+			user_msg = llformat("Deleted %u scripts from object %s.", scriptcount, name.c_str());
 		}
 		else
 		{
-			user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name);
+			user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name.c_str());
 		}
 		reqObjectID.setNull();
 		if(countingDone)
@@ -146,7 +146,7 @@ void ScriptCounter::processObjectProperties(LLMessageSystem* msg, void** user_da
 
 void ScriptCounter::serializeSelection(bool delScript)
 {
-	LLDynamicArray<LLViewerObject*> catfayse;
+	LLDynamicArray<LLViewerObject*> objectArray;
 	foo=LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
 	sstr.str("");
 	doDelete=false;
@@ -173,7 +173,7 @@ void ScriptCounter::serializeSelection(bool delScript)
 					LLViewerObject* object = attachment->getObject();
 					if(object)
 					{
-						catfayse.put(object);
+						objectArray.put(object);
 						objectCount++;
 					}
 				}
@@ -188,7 +188,7 @@ void ScriptCounter::serializeSelection(bool delScript)
 				LLViewerObject* object = selectNode->getObject();
 				if(object)
 				{
-					catfayse.put(object);
+					objectArray.put(object);
 					objectCount++;
 				}
 			}
@@ -240,7 +240,7 @@ void ScriptCounter::serializeSelection(bool delScript)
 				gAgent.sendReliableMessage();
 			}
 		}
-		serialize(catfayse);
+		serialize(objectArray);
 	}
 }
 
@@ -310,7 +310,7 @@ void ScriptCounter::completechk()
 					valid=0;
 				  if(valid)
 				  {
-					  user_msg = llformat("Counted %u scripts in %u attachments on %s %s.", scriptcount, objectCount, firstname->getString(), lastname->getString());
+					  user_msg = llformat("Counted %u scripts in %u attachments on %s %s.", scriptcount, objectCount, firstname->getString()  , lastname->getString());
 					  //sstr << "Counted scripts from " << << " attachments on " << firstname->getString() << " " << lastname->getString() << ": ";
 				  }
 				}