diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 9e3d62ad4..9c64214c0 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1540,7 +1540,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 				mat_vert.affineTransform(src[i], position);
 				//Still using getF32ptr() because if the array is strided then theres no guarantee vertices will aligned, which LLVector4a requires
 				vert[i].set(position.getF32ptr()); //This assignment and the one below are oddly sensitive. Suspect something's off around here.
-				vert[i].mV[3] = index;
+				*(vert[i].mV+3) = index;
 			}
 			for (S32 i = num_vertices; i < mGeomCount; i++)
 			{
@@ -2126,4 +2126,4 @@ void LLFace::setRiggedIndex(U32 type, S32 index)
 }
 
 
-#endif //MESH_ENABLED
\ No newline at end of file
+#endif //MESH_ENABLED
diff --git a/indra/newview/llvoclouds.cpp b/indra/newview/llvoclouds.cpp
index bab25330c..e56c78638 100644
--- a/indra/newview/llvoclouds.cpp
+++ b/indra/newview/llvoclouds.cpp
@@ -246,13 +246,13 @@ void LLVOClouds::getGeometry(S32 te,
 	vtx[2] = puff_pos_agent + right + up;
 	vtx[3] = puff_pos_agent + right - up;
 
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++  = vtx[0];
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++  = vtx[1];
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++  = vtx[2];
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++  = vtx[3];;
 
 	*texcoordsp++ = uvs[0];
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index f3417f11b..5391d5841 100644
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -328,13 +328,13 @@ void LLVOPartGroup::getGeometry(S32 idx,
 	// this works because there is actually a 4th float stored after the vertex position which is used as a texture index
 	// also, somebody please VECTORIZE THIS
 
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++ = part_pos_agent + up - right;
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++ = part_pos_agent - up - right;
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++ = part_pos_agent + up + right;
-	verticesp->mV[3] = 0.f;
+	*(verticesp->mV+3) = 0.f;
 	*verticesp++ = part_pos_agent - up + right;
 
 	*colorsp++ = part.mColor;
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 8ba1a3838..c3c64e17c 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -224,11 +224,10 @@ void LLWaterParamManager::propagateParameters(void)
 	// bind the variables only if we're using shaders
 	if(gPipeline.canUseVertexShaders())
 	{
-		LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
-		end_shaders = mShaderList.end();
-		for(shaders_iter = mShaderList.begin(); shaders_iter != end_shaders; ++shaders_iter)
+		std::vector<LLGLSLShader*>::iterator shaders_iter=mShaderList.begin();
+		for(; shaders_iter != mShaderList.end(); ++shaders_iter)
 		{
-			shaders_iter->mUniformsDirty = TRUE;
+			(*shaders_iter)->mUniformsDirty = TRUE;
 		}
 	}
 
@@ -331,11 +330,10 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
 		sunMoonDir.normVec();
 		mWaterFogKS = 1.f/llmax(sunMoonDir.mV[2], WATER_FOG_LIGHT_CLAMP);
 
-		LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
-		end_shaders = mShaderList.end();
-		for(shaders_iter = mShaderList.begin(); shaders_iter != end_shaders; ++shaders_iter)
+		std::vector<LLGLSLShader*>::iterator shaders_iter=mShaderList.begin();
+		for(; shaders_iter != mShaderList.end(); ++shaders_iter)
 		{
-			shaders_iter->mUniformsDirty = TRUE;
+			(*shaders_iter)->mUniformsDirty = TRUE;
 		}
 	}
 }
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index 72d82af68..35ee41de8 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -357,11 +357,10 @@ void LLWLParamManager::propagateParameters(void)
 	mCurParams.set("lightnorm", mLightDir);
 
 	// bind the variables for all shaders only if we're using WindLight
-	LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
-	end_shaders = mShaderList.end();
-	for(shaders_iter = mShaderList.begin(); shaders_iter != end_shaders; ++shaders_iter) 
+	std::vector<LLGLSLShader*>::iterator shaders_iter=mShaderList.begin();
+	for(; shaders_iter != mShaderList.end(); ++shaders_iter)
 	{
-		shaders_iter->mUniformsDirty = TRUE;
+		(*shaders_iter)->mUniformsDirty = TRUE;
 	}
 
 	// get the cfr version of the sun's direction
@@ -415,11 +414,10 @@ void LLWLParamManager::update(LLViewerCamera * cam)
 		lightNorm3 *= LLQuaternion(-(camYaw + camYawDelta), LLVector3(0.f, 1.f, 0.f));
 		mRotatedLightDir = LLVector4(lightNorm3, 0.f);
 
-		LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
-		end_shaders = mShaderList.end();
-		for(shaders_iter = mShaderList.begin(); shaders_iter != end_shaders; ++shaders_iter)
+		std::vector<LLGLSLShader*>::iterator shaders_iter=mShaderList.begin();
+		for(; shaders_iter != mShaderList.end(); ++shaders_iter)
 		{
-			shaders_iter->mUniformsDirty = TRUE;
+			(*shaders_iter)->mUniformsDirty = TRUE;
 		}
 	}
 }