diff --git a/indra/llcommon/lldarray.h b/indra/llcommon/lldarray.h
index 7dce615868..6ab02d3466 100644
--- a/indra/llcommon/lldarray.h
+++ b/indra/llcommon/lldarray.h
@@ -152,6 +152,8 @@ inline S32	LLDynamicArray<Type,BlockSize>::put(const Type &obj)
 template <typename Type,int BlockSize>
 inline void LLDynamicArray<Type,BlockSize>::operator+=(const LLDynamicArray<Type,BlockSize> &other)
 {
+	// <FS:ND> Fix for GCC 4.7.1
+	//insert(this->end(), other.begin(), other.end());
 	this->insert(this->end(), other.begin(), other.end());
 }
 
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h
index 9df4264f80..88a5e6ec74 100644
--- a/indra/llcommon/lleventcoro.h
+++ b/indra/llcommon/lleventcoro.h
@@ -102,10 +102,6 @@ LLVoidListener<LISTENER> voidlistener(const LISTENER& listener)
 
 namespace LLEventDetail
 {
-    /// Implementation for listenerNameForCoro()
-    LL_COMMON_API std::string listenerNameForCoroImpl(const void* self_id);
-
-
     /**
      * waitForEventOn() permits a coroutine to temporarily listen on an
      * LLEventPump any number of times. We don't really want to have to ask
@@ -133,6 +129,9 @@ namespace LLEventDetail
         return listenerNameForCoroImpl(self.get_id());
     }
 
+    /// Implementation for listenerNameForCoro()
+    LL_COMMON_API std::string listenerNameForCoroImpl(const void* self_id);
+
     /**
      * Implement behavior described for postAndWait()'s @a replyPumpNamePath
      * parameter:
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index a99ea70257..94c5d53d67 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -87,12 +87,11 @@ public:
 
 		FT_BASIC_ROOT = 52,
 
-		// Ansariel: Folder types for our own virtual system folders
-		//-TT - adjusted for new LL types
+		// <FS:Ansariel> Folder types for our own virtual system folders
 		FT_FIRESTORM = 53,		
 		FT_PHOENIX = 54,
 		FT_RLV = 55,
-		// END Ansariel: Folder types for our own virtual system folders
+		// </FS:Ansariel> Folder types for our own virtual system folders
 
 		FT_COUNT,