diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp
index 6ca1f8c8edbc91141dcef693b43fe1cc552abda3..b80de9ccd625f971410f91d3350e1e804a22ecc2 100644
--- a/indra/llrender/llcubemap.cpp
+++ b/indra/llrender/llcubemap.cpp
@@ -263,8 +263,7 @@ void LLCubeMap::setMatrix(S32 stage)
 		gGL.getTexUnit(stage)->activate();
 	}
 
-	LLMatrix4a trans;
-	trans.loadu(gGLModelView);
+	LLMatrix4a trans = get_current_modelview();
 	trans.setRow<3>(LLVector4a::getZero());
 	trans.transpose();
 
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 04b222985a6dffa6e248a0b3cd5ee3167ec39e37..b367462d2572c201a9ff93036e8a6b9b0e972db0 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -565,8 +565,6 @@ void copy_matrix(const LLMatrix4a& src, F32* dst);
 void set_current_modelview(const LLMatrix4a& mat);
 void set_current_projection(const LLMatrix4a& mat);
 
-glh::matrix4f gl_perspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar);
-
 #if LL_RELEASE_FOR_DOWNLOAD
     #define LL_SHADER_LOADING_WARNS(...) LL_WARNS_ONCE("ShaderLoading")
     #define LL_SHADER_UNIFORM_ERRS(...)  LL_WARNS_ONCE("Shader")
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index be6c6ebbc709b9893f185fac68d17e679c2d657c..7a0ec360b2481790af7a2816450c43bf3663f814 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5912,7 +5912,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 		gGL.pushUIMatrix();
 		gGL.loadUIIdentity();
 		gGL.loadIdentity();
-		gGL.loadMatrix(OGL_TO_CFR_ROTATION);		// Load Cory's favorite reference frame
+		gGL.loadMatrix(OGL_TO_CFR_ROTATION_4A);		// Load Cory's favorite reference frame
 		gGL.translatef(-hud_bbox.getCenterLocal().mV[VX] + (depth *0.5f), 0.f, 0.f);
 		gGL.scalef(cur_zoom, cur_zoom, cur_zoom);
 	}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 80dcbe34ddf6e7604af39aa212f901b4c42d90ac..bde8a6939a4974fc49d0a5f07d869f44e50d6e12 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4176,7 +4176,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
 			gGL.matrixMode(LLRender::MM_MODELVIEW);
 			gGL.pushMatrix();
 			gGL.loadIdentity();
-			gGL.loadMatrix(OGL_TO_CFR_ROTATION);		// Load Cory's favorite reference frame
+			gGL.loadMatrix(OGL_TO_CFR_ROTATION_4A);		// Load Cory's favorite reference frame
 			gGL.translatef(-hud_bbox.getCenterLocal().mV[VX] + (depth *0.5f), 0.f, 0.f);
 		}
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 9ca8e7fcbd9c024b7870c3d04be104b7b71d6048..4e85fe40b72ec44e5136f014644bfadc9a86dfa8 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -11024,13 +11024,13 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 
 	if (!CameraOffset)
 	{
-		memcpy(gGLModelView, saved_view.getF32ptr(), sizeof(F32) * 16);
-		memcpy(gGLProjection, saved_proj.getF32ptr(), sizeof(F32) * 16);
+		set_current_modelview(saved_view);
+		set_current_projection(saved_proj);
 	}
 	else
 	{
-		memcpy(gGLModelView, view[1].getF32ptr(), sizeof(F32) * 16);
-		memcpy(gGLProjection, proj[1].getF32ptr(), sizeof(F32) * 16);
+		set_current_modelview(view[1]);
+		set_current_projection(proj[1]);
 
 		gGL.loadMatrix(view[1]);
 		gGL.matrixMode(LLRender::MM_PROJECTION);
diff --git a/indra/newview/rlveffects.cpp b/indra/newview/rlveffects.cpp
index e37381e5423cea71b1b1d1e1fa77c28d969b15fb..f54ae7ae507f6096be2e0e3a16d7df1ccf719408 100644
--- a/indra/newview/rlveffects.cpp
+++ b/indra/newview/rlveffects.cpp
@@ -337,7 +337,6 @@ void RlvSphereEffect::setShaderUniforms(LLGLSLShader* pShader)
 	pShader->uniform2f(LLShaderMgr::RLV_EFFECT_PARAM3, eDistExtend & (int)ESphereDistExtend::Min, eDistExtend & (int)ESphereDistExtend::Max);
 
 	// Pass effect params
-	const glh::vec4f effectParams(m_Params.get().mV);
 	pShader->uniform4fv(LLShaderMgr::RLV_EFFECT_PARAM4, 1, m_Params.get().mV);
 }