diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 6e63b7bc5..946361e62 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -875,7 +875,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 					{ //dump every 128 lines
 
 						LL_WARNS("ShaderLoading") << "\n" << ostr.str() << LL_ENDL;
-						ostr = std::stringstream();
+						ostr.clear();
+						ostr.str(LLStringUtil::null);
 					}
 
 				}
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index e724dfb54..252517d19 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -561,7 +561,7 @@ void LLLayoutStack::updateFractionalSizes()
 			panelp->mFractionalSize = panel_resizable_dim > 0.f 
 				? llclamp(panel_resizable_dim / total_resizable_dim, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE)
 				: MIN_FRACTIONAL_SIZE;
-			llassert(!llisnan(panelp->mFractionalSize));
+			llassert(!std::isnan(panelp->mFractionalSize));
 		}
 	}
 
@@ -789,7 +789,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 				fraction_given_up -= new_fractional_size - panelp->mFractionalSize;
 				fraction_remaining -= panelp->mFractionalSize;
 				panelp->mFractionalSize = new_fractional_size;
-				llassert(!llisnan(panelp->mFractionalSize));
+				llassert(!std::isnan(panelp->mFractionalSize));
 			}
 			else
 			{
@@ -805,7 +805,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 				fraction_given_up -= new_fractional_size - panelp->mFractionalSize;
 				fraction_remaining -= panelp->mFractionalSize;
 				panelp->mFractionalSize = new_fractional_size;
-				llassert(!llisnan(panelp->mFractionalSize));
+				llassert(!std::isnan(panelp->mFractionalSize));
 			}
 			else
 			{	// freeze new size as original size
diff --git a/indra/newview/llappviewerlinux_api_dbus.cpp b/indra/newview/llappviewerlinux_api_dbus.cpp
index ff839b700..f56a75c59 100644
--- a/indra/newview/llappviewerlinux_api_dbus.cpp
+++ b/indra/newview/llappviewerlinux_api_dbus.cpp
@@ -47,9 +47,9 @@ extern "C" {
 #include "apr_dso.h"
 }
 
-#define DEBUGMSG(...) LL_DEBUGS() << llformat(__VA_ARGS__) << llendl
-#define INFOMSG(...) LL_INFOS() << llformat(__VA_ARGS__) << llendl
-#define WARNMSG(...) LL_WARNS() << llformat(__VA_ARGS__) << llendl
+#define DEBUGMSG(...) LL_DEBUGS() << llformat(__VA_ARGS__) << LL_ENDL
+#define INFOMSG(...) LL_INFOS() << llformat(__VA_ARGS__) << LL_ENDL
+#define WARNMSG(...) LL_WARNS() << llformat(__VA_ARGS__) << LL_ENDL
 
 #define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) RTN (*ll##DBUSSYM)(__VA_ARGS__) = NULL
 #include "llappviewerlinux_api_dbus_syms_raw.inc"
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index 981d05727..733f1047a 100644
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -409,7 +409,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 			inv_camera_dist_squared = 1.f;
 
 		llassert(std::isfinite(inv_camera_dist_squared));
-		llassert(!llisnan(inv_camera_dist_squared));
+		llassert(!std::isnan(inv_camera_dist_squared));
 
 		F32 area = part->mScale.mV[0] * part->mScale.mV[1] * inv_camera_dist_squared;
 		tot_area = llmax(tot_area, area);
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp
index efbedea7f..577dca897 100644
--- a/indra/newview/llwebprofile.cpp
+++ b/indra/newview/llwebprofile.cpp
@@ -87,7 +87,7 @@ public:
 		Json::Reader reader;
 		if (!reader.parse(body, root))
 		{
-			LL_WARNS() << "Failed to parse upload config: " << reader.getFormatedErrorMessages() << LL_ENDL;
+			LL_WARNS() << "Failed to parse upload config: " << reader.getFormattedErrorMessages() << LL_ENDL;
 			LLWebProfile::reportImageUploadStatus(false);
 			return;
 		}