diff --git a/indra/llcommon/llfindlocale.cpp b/indra/llcommon/llfindlocale.cpp
index f019bd0c647f675bba5c3fbfd57d499812189dfc..3d6aaf70fe5e6c07cd9a433e1ace7cbc55bf8265 100644
--- a/indra/llcommon/llfindlocale.cpp
+++ b/indra/llcommon/llfindlocale.cpp
@@ -177,7 +177,7 @@ canonise_fl(FL_Locale *l) {
 #define RML(pn,sn) MAKELANGID(LANG_##pn, SUBLANG_##sn)
 struct IDToCode {
   LANGID id;
-  char*  code;
+  const char*  code;
 };
 static const IDToCode both_to_code[] = {
   {ML(ENGLISH,US),           "en_US.ISO_8859-1"},
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index e40c98ca12120c4c63e91f31db3eadd1cc273907..a7ba1e24a7a3ad749dddb485e7ca773db5139bb5 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -99,7 +99,7 @@ void LLDrawPoolTree::render(S32 pass)
 	LLGLState test(GL_ALPHA_TEST, LLGLSLShader::sNoFixedFunction ? 0 : 1);
 
 // [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
-	LLViewerTexture* pTexture = (LLPipeline::sRenderTextures) ? mTexturep : LLViewerFetchedTexture::sDefaultDiffuseImagep;
+	LLViewerTexture* pTexture = (LLPipeline::sRenderTextures) ? static_cast<LLViewerTexture*>(mTexturep) : static_cast<LLViewerTexture*>(LLViewerFetchedTexture::sDefaultDiffuseImagep);
 	gGL.getTexUnit(sDiffTex)->bind(pTexture);
 // [/SL:KB]
 //	gGL.getTexUnit(sDiffTex)->bind(mTexturep);
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 37ac88369c125d9159e7460bab5b366bc0f4b02b..351adf366885eba8de463971013c3c18e517f804 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -639,7 +639,8 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li
 			}
 			else
 			{
-				LLGLSquashToFarClip far_clip(get_current_projection());
+				auto proj = get_current_projection();
+				LLGLSquashToFarClip far_clip(proj);
 				face->renderIndexed();
 			}
 		}