diff --git a/indra/newview/llautocorrect.cpp b/indra/newview/llautocorrect.cpp
index c16787d637606c9ac9bd59570dcd5df02c866e63..9162b35f45256d6259538849c1634f6872df3c70 100644
--- a/indra/newview/llautocorrect.cpp
+++ b/indra/newview/llautocorrect.cpp
@@ -375,7 +375,7 @@ std::string AutoCorrect::replaceWords(std::string words)
 					args["REPLACEMENT"]=replacement;
 					LLNotificationsUtil::add("AutoReplace",args);
 				}
-				ldebugs << "found a word in list " << location.c_str() << " and it will replace  " << currentWord.c_str() << " => " << replacement.c_str() << llendl;
+				lldebugs << "found a word in list " << location.c_str() << " and it will replace  " << currentWord.c_str() << " => " << replacement.c_str() << llendl;
 				int wordStart = words.find(currentWord);
 				words.replace(wordStart,currentWord.length(),replacement);
 				return replaceWords(words);//lol recursion!
diff --git a/indra/newview/llautocorrectfloater.cpp b/indra/newview/llautocorrectfloater.cpp
index 74762a876fe25d5a7d4b6ed147f2666c17e89926..97170fc65c79f079f12ad63cebb3fb0c08f7da55 100644
--- a/indra/newview/llautocorrectfloater.cpp
+++ b/indra/newview/llautocorrectfloater.cpp
@@ -159,7 +159,7 @@ void AutoCorrectFloater::updateItemsList()
 void AutoCorrectFloater::updateNamesList()
 {
 	namesList->deleteAllItems();
-	if(!gSavedSettings, "AutoCorrect")
+	if(!gSavedSettings.getBOOL("AutoCorrect"))
 	{
 		updateItemsList();
 		return;
@@ -208,7 +208,8 @@ void AutoCorrectFloater::updateListControlsEnabled(BOOL selected)
 }
 void AutoCorrectFloater::updateEnabledStuff()
 {
-	if(!gSavedSettings, "AutoCorrect")
+	BOOL autocorrect = gSavedSettings.getBOOL("AutoCorrect");
+	if(autocorrect)
 	{
 		LLCheckBoxCtrl *enBox = getChild<LLCheckBoxCtrl>("ac_enable");
 		enBox->setDisabledColor(LLColor4::red);
@@ -219,9 +220,9 @@ void AutoCorrectFloater::updateEnabledStuff()
 			LLUIColorTable::instance().getColor( "LabelTextColor" ));
 	}
 
-	childSetEnabled("ac_list_name",enabledd);
-	childSetEnabled("ac_list_entry",enabledd);
-	updateListControlsEnabled(enabledd);
+	childSetEnabled("ac_list_name", autocorrect);
+	childSetEnabled("ac_list_entry", autocorrect);
+	updateListControlsEnabled(autocorrect);
 	updateNamesList();
 	AutoCorrect::getInstance()->save();
 
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 8c8707e16cf469ae168a3db4afabe75ce0a449b5..86244cbaa6c46af33aada994ddc4cc10daa29c81 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -89,7 +89,7 @@ BOOL LLNearbyChatBar::postBuild()
 	mChatBox = getChild<LLLineEditor>("chat_box");
 
 	// *TODO Establish LineEditor with autocorrect callback
-//	mChatBox->setAutocorrectCallback(boost::bind(&AutoCorrect::autocorrectCallback));
+//	mChatBox->setAutocorrectCallback(boost::bind(&AutoCorrect::autocorrectCallback, _1, _2));
 	mChatBox->setCommitCallback(boost::bind(&LLNearbyChatBar::onChatBoxCommit, this));
 	mChatBox->setKeystrokeCallback(&onChatBoxKeystroke, this);
 	mChatBox->setFocusLostCallback(boost::bind(&onChatBoxFocusLost, _1, this));