diff --git a/indra/llaudio/llaudioengine_fmod.cpp b/indra/llaudio/llaudioengine_fmod.cpp
index 7b12b62d53e2651082979614f7b02d51dd5d06f0..d7f58defca57cd56e9682c7a664cac30e90a8df3 100644
--- a/indra/llaudio/llaudioengine_fmod.cpp
+++ b/indra/llaudio/llaudioengine_fmod.cpp
@@ -132,6 +132,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 	bool audio_ok = false;
 
 	if (!audio_ok)
+	{
 		if (NULL == getenv("LL_BAD_FMOD_ESD")) /*Flawfinder: ignore*/
 		{
 			LL_DEBUGS("AppInit") << "Trying ESD audio output..." << LL_ENDL;
@@ -148,8 +149,9 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 		} else {
 			LL_DEBUGS("AppInit") << "ESD audio output SKIPPED" << LL_ENDL;
 		}
-
+	}
 	if (!audio_ok)
+	{
 		if (NULL == getenv("LL_BAD_FMOD_OSS")) 	 /*Flawfinder: ignore*/
 		{
 			LL_DEBUGS("AppInit") << "Trying OSS audio output..."	<< LL_ENDL;
@@ -165,8 +167,9 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 		} else {
 			LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL;
 		}
-
+	}
 	if (!audio_ok)
+	{
 		if (NULL == getenv("LL_BAD_FMOD_ALSA"))		/*Flawfinder: ignore*/
 		{
 			LL_DEBUGS("AppInit") << "Trying ALSA audio output..." << LL_ENDL;
@@ -182,7 +185,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 		} else {
 			LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL;
 		}
-
+	}
 	if (!audio_ok)
 	{
 		LL_WARNS("AppInit") << "Overall audio init failure." << LL_ENDL;
diff --git a/indra/llmath/tests/v2math_test.cpp b/indra/llmath/tests/v2math_test.cpp
index 748cdf913a3cccfd43fd05f39230339eea8c20f6..456faf7c0c39de54c9d55a14a7dd24934d092fb5 100644
--- a/indra/llmath/tests/v2math_test.cpp
+++ b/indra/llmath/tests/v2math_test.cpp
@@ -379,7 +379,7 @@ namespace tut
 		x1 = 1.0f, y1 = 2.0f, x2 = 1.0f, y2 = 3.2234f;
 		vec2.setVec(x1, y1);
 		vec3.setVec(x2, y2);
-		ensure("2:operator < failed", (FALSE == vec3 < vec2));	
+		ensure("2:operator < failed", (FALSE == (vec3 < vec2)));	
 	}
 
 	template<> template<>
diff --git a/indra/llmath/tests/v3math_test.cpp b/indra/llmath/tests/v3math_test.cpp
index 00cffde3672d914d89657e91c8700c7680197a69..14159974a398be914b4378688b0c781eacb9aa1a 100644
--- a/indra/llmath/tests/v3math_test.cpp
+++ b/indra/llmath/tests/v3math_test.cpp
@@ -460,15 +460,15 @@ namespace tut
 	{
 		F32 x1 =-2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f, y2 = 1.11f, z2 = 1234.234f;
 		LLVector3 vec3(x1,y1,z1), vec3a(x2,y2,z2);
-		ensure("1:operator< failed", (TRUE == vec3 < vec3a));	
+		ensure("1:operator< failed", (TRUE == (vec3 < vec3a)));
 		x1 =-2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f, y2 = 2.f, z2 = 1234.234f;
 		vec3.setVec(x1,y1,z1);
 		vec3a.setVec(x2,y2,z2);
-		ensure("2:operator< failed ", (TRUE == vec3 < vec3a));	
+		ensure("2:operator< failed ", (TRUE == (vec3 < vec3a)));
 		x1 =2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f,
 		vec3.setVec(x1,y1,z1);
 		vec3a.setVec(x2,y2,z2);
-		ensure("3:operator< failed ", (FALSE == vec3 < vec3a));	
+		ensure("3:operator< failed ", (FALSE == (vec3 < vec3a)));
 	}
 
 	template<> template<>