diff --git a/indra/llui/llhandle.h b/indra/llui/llhandle.h
index e6390ee599b10a0c5cf26dc9e4074d6a323f23f4..37c657dd9229b38ace1e1e1bc6f12273afce4de4 100644
--- a/indra/llui/llhandle.h
+++ b/indra/llui/llhandle.h
@@ -166,7 +166,7 @@ class LLHandleProvider
 	} 
 
 	template <typename U>
-	typename LLHandle<U> getDerivedHandle(typename boost::enable_if< typename boost::is_convertible<U*, T*> >::type* dummy = 0) const
+	LLHandle<U> getDerivedHandle(typename boost::enable_if< typename boost::is_convertible<U*, T*> >::type* dummy = 0) const
 	{
 		LLHandle<U> downcast_handle;
 		downcast_handle.mTombStone = getHandle().mTombStone;
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 7927f84cba59182c46202524dbecd21691a8e85a..ab209577609b8efb728efd8c8cb7f2df5d0ba592 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -764,7 +764,7 @@ namespace LLInitParam
 		{
 			if (NAME_VALUE_LOOKUP::getValueFromName(val, mValue))
 			{
-				setValueName(val);
+				NAME_VALUE_LOOKUP::setValueName(val);
 			}
 			else
 			{
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp
index 90c2671242ac0098d27736981f3be6250e066883..58654dcc218459df48e37a0ba717d00361bb0e13 100644
--- a/indra/llxuixml/llxuiparser.cpp
+++ b/indra/llxuixml/llxuiparser.cpp
@@ -129,7 +129,7 @@ struct Any : public LLInitParam::Block<Any, Occurs>
 
 struct All : public LLInitParam::Block<All, Occurs>
 {
-	Multiple<Lazy<Element>> elements;
+	Multiple< Lazy<Element> > elements;
 
 	All()
 	:	elements("element")
@@ -140,11 +140,11 @@ struct All : public LLInitParam::Block<All, Occurs>
 
 struct Choice : public LLInitParam::ChoiceBlock<Choice, Occurs>
 {
-	Alternative<Lazy<Element>>	element;
-	Alternative<Lazy<Group>>	group;
-	Alternative<Lazy<Choice>>	choice;
-	Alternative<Lazy<Sequence>>	sequence;
-	Alternative<Lazy<Any>>		any;
+	Alternative< Lazy<Element> >	element;
+	Alternative< Lazy<Group> >		group;
+	Alternative< Lazy<Choice> >		choice;
+	Alternative< Lazy<Sequence> >	sequence;
+	Alternative< Lazy<Any> >		any;
 
 	Choice()
 	:	element("element"),
@@ -158,11 +158,11 @@ struct Choice : public LLInitParam::ChoiceBlock<Choice, Occurs>
 
 struct Sequence : public LLInitParam::ChoiceBlock<Sequence, Occurs>
 {
-	Alternative<Lazy<Element>>	element;
-	Alternative<Lazy<Group>>	group;
-	Alternative<Lazy<Choice>>	choice;
-	Alternative<Lazy<Sequence>>	sequence;
-	Alternative<Lazy<Any>>		any;
+	Alternative< Lazy<Element> >	element;
+	Alternative< Lazy<Group> >		group;
+	Alternative< Lazy<Choice> >		choice;
+	Alternative< Lazy<Sequence> >	sequence;
+	Alternative< Lazy<Any> >		any;
 };
 
 struct GroupContents : public LLInitParam::ChoiceBlock<GroupContents, Occurs>
@@ -247,7 +247,7 @@ struct ComplexType : public LLInitParam::Block<ComplexType, ComplexTypeContents>
 	Optional<bool>					mixed;
 
 	Multiple<Attribute>				attribute;
-	Multiple<Lazy<Element>>			elements;
+	Multiple< Lazy<Element> >			elements;
 
 	ComplexType()
 	:	name("name"),