diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 3bbea891a7fd18c1011b537148ff24fa8bc8c16e..603390a22d1d29d7528400d3eba32075c351d10f 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1114,7 +1114,7 @@ void LLImageRaw::compositeScaled4onto3(LLImageRaw* src)
 	llassert( (4 == src->getComponents()) && (3 == dst->getComponents()) );
 
 	S32 temp_data_size = src->getWidth() * dst->getHeight() * src->getComponents();
-	llassert_always(temp_data_size > 0);
+	llassert(temp_data_size > 0);
 	std::vector<U8> temp_buffer(temp_data_size);
 
 	// Vertical: scale but no composite
diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
index a804f3e28a5d13ab7a35d8848c741a65a8a8df39..30c03d24f01f66d76d62fce43f389c36f263be8c 100644
--- a/indra/llimage/llimagefilter.cpp
+++ b/indra/llimage/llimagefilter.cpp
@@ -386,7 +386,7 @@ void LLImageFilter::convolve(const LLMatrix3 &kernel, bool normalize, bool abs_v
 	U8* dst_data = mImage->getData();
 
 	S32 buffer_size = width * components;
-	llassert_always(buffer_size > 0);
+	llassert(buffer_size > 0);
 	std::vector<U8> even_buffer(buffer_size);
 	std::vector<U8> odd_buffer(buffer_size);
 	
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 3f026cd8378ce7e1c23628b71603d97d03d9ef48..15ac33b4d4252d8faa9a7b359fab9ac0dd0be5a0 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1462,6 +1462,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 	}
     const LLMeshSkinInfo* skin = nullptr;
     LLMatrix4a mat_vert;
+	mat_vert.setIdentity();
     LLMatrix4a mat_normal;
 
     // prepare mat_vert
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 63a6c22293e561bbcc2d4a365c374a780f27d9cd..b04341cbf48d8a9974c310a3f810f0e5515f223a 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -487,7 +487,7 @@ void LLFloaterWorldMap::draw()
 	bool agent_on_prelude = (regionp && regionp->isPrelude());
 	bool enable_go_home = gAgent.isGodlike() || !agent_on_prelude;
 // [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
-	mGoHomeButton->setEnabled(enable_go_home && (!rlv_handler_t::isEnabled()) || !(gRlvHandler.hasBehaviour(RLV_BHVR_TPLM) && gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)));
+	mGoHomeButton->setEnabled(enable_go_home && ((!rlv_handler_t::isEnabled()) || !(gRlvHandler.hasBehaviour(RLV_BHVR_TPLM) && gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC))));
 // [/RLVa:KB]
 
 	updateLocation();
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e8baa5f0953d1f5c19490287de1664ee459ce69e..9f3aae2ee8022ed49322a01378fc4e3f3b703517 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1161,7 +1161,7 @@ def strip_binaries(self):
                 ["find"] +
                 [os.path.join(self.get_dst_prefix(), dir) for dir in ('bin', 'lib')] +
                 ['-type', 'f', '!', '-name', '*.py', '!', '-name', '*.pak', '!', '-name', '*.bin', '!', '-name', '*.dat',
-                 '!', '-name', 'update_install', '!', '-name', '*.exe', '!', '-name', '*.dll', '!', '-name', '*.pdb', '!', '-name', '*.json', 
+                 '!', '-name', 'update_install', '!', '-name', '*.exe', '!', '-name', '*.dll', '!', '-name', '*.lib', '!', '-name', '*.pdb', '!', '-name', '*.json', 
                  '-exec', 'strip', '-S', '{}', ';'])
 
 class Linux_i686_Manifest(LinuxManifest):