diff --git a/indra/llmath/llmatrix4a.h b/indra/llmath/llmatrix4a.h
index 75f0a534b68ef252ab449a495d23cdcfaae8db88..81986ce5ecfbc3be60292b1233b68a1b326f5050 100644
--- a/indra/llmath/llmatrix4a.h
+++ b/indra/llmath/llmatrix4a.h
@@ -108,11 +108,12 @@ class alignas(16) LLMatrix4a
 
 	inline void setIdentity()
 	{
-		const __m128 ones = _mm_set_ps(1.f,0.f,0.f,1.f);
-		mMatrix[0] = _mm_movelh_ps(ones,_mm_setzero_ps());
-		mMatrix[1] = _mm_movehl_ps(_mm_setzero_ps(),ones);
-		mMatrix[2] = _mm_movelh_ps(_mm_setzero_ps(),ones);
-		mMatrix[3] = _mm_movehl_ps(ones,_mm_setzero_ps());
+		const LLQuad ones = _mm_set_ps(1.f,0.f,0.f,1.f);
+		const LLQuad zeroes = _mm_setzero_ps();
+		mMatrix[0] = _mm_movelh_ps(ones, zeroes);
+		mMatrix[1] = _mm_movehl_ps(zeroes,ones);
+		mMatrix[2] = _mm_movelh_ps(zeroes,ones);
+		mMatrix[3] = _mm_movehl_ps(ones, zeroes);
 	}
 
 	inline void load4a(const F32* src)
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 58272ec12e0d5fef433dccd623b46c680c6975b3..df7ac879f77990b781ae662cc474d5b0077ebd7f 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -865,7 +865,7 @@ LLRender::LLRender()
 	mLightHash = 0;
 	
 	//Init base matrix for each mode
-	for(S32 i = 0; i < NUM_MATRIX_MODES; ++i)
+	for(U32 i = 0; i < NUM_MATRIX_MODES; ++i)
 	{
 		mMatrix[i][0].setIdentity();
 	}