diff --git a/src/math.cpp b/src/math.cpp
index 3ec3065..4e3380a 100644
--- a/src/math.cpp
+++ b/src/math.cpp
@@ -518,15 +518,15 @@ namespace bx
 
 	void mtx3Inverse(float* _result, const float* _a)
 	{
-		float xx = _a[0];
-		float xy = _a[1];
-		float xz = _a[2];
-		float yx = _a[3];
-		float yy = _a[4];
-		float yz = _a[5];
-		float zx = _a[6];
-		float zy = _a[7];
-		float zz = _a[8];
+		const float xx = _a[0];
+		const float xy = _a[1];
+		const float xz = _a[2];
+		const float yx = _a[3];
+		const float yy = _a[4];
+		const float yz = _a[5];
+		const float zx = _a[6];
+		const float zy = _a[7];
+		const float zz = _a[8];
 
 		float det = 0.0f;
 		det += xx * (yy*zz - yz*zy);
@@ -550,22 +550,22 @@ namespace bx
 
 	void mtxInverse(float* _result, const float* _a)
 	{
-		float xx = _a[ 0];
-		float xy = _a[ 1];
-		float xz = _a[ 2];
-		float xw = _a[ 3];
-		float yx = _a[ 4];
-		float yy = _a[ 5];
-		float yz = _a[ 6];
-		float yw = _a[ 7];
-		float zx = _a[ 8];
-		float zy = _a[ 9];
-		float zz = _a[10];
-		float zw = _a[11];
-		float wx = _a[12];
-		float wy = _a[13];
-		float wz = _a[14];
-		float ww = _a[15];
+		const float xx = _a[ 0];
+		const float xy = _a[ 1];
+		const float xz = _a[ 2];
+		const float xw = _a[ 3];
+		const float yx = _a[ 4];
+		const float yy = _a[ 5];
+		const float yz = _a[ 6];
+		const float yw = _a[ 7];
+		const float zx = _a[ 8];
+		const float zy = _a[ 9];
+		const float zz = _a[10];
+		const float zw = _a[11];
+		const float wx = _a[12];
+		const float wy = _a[13];
+		const float wz = _a[14];
+		const float ww = _a[15];
 
 		float det = 0.0f;
 		det += xx * (yy*(zz*ww - zw*wz) - yz*(zy*ww - zw*wy) + yw*(zy*wz - zz*wy) );
@@ -598,15 +598,15 @@ namespace bx
 
 	void mtx3Cofactor(float* _result, const float* _a)
 	{
-		float xx = _a[0];
-		float xy = _a[1];
-		float xz = _a[2];
-		float yx = _a[3];
-		float yy = _a[4];
-		float yz = _a[5];
-		float zx = _a[6];
-		float zy = _a[7];
-		float zz = _a[8];
+		const float xx = _a[0];
+		const float xy = _a[1];
+		const float xz = _a[2];
+		const float yx = _a[3];
+		const float yy = _a[4];
+		const float yz = _a[5];
+		const float zx = _a[6];
+		const float zy = _a[7];
+		const float zz = _a[8];
 
 		_result[0] = +(yy*zz - yz * zy);
 		_result[1] = -(yx*zz - yz * zx);
@@ -623,42 +623,42 @@ namespace bx
 
 	void mtxCofactor(float* _result, const float* _a)
 	{
-		float xx = _a[0];
-		float xy = _a[1];
-		float xz = _a[2];
-		float xw = _a[3];
-		float yx = _a[4];
-		float yy = _a[5];
-		float yz = _a[6];
-		float yw = _a[7];
-		float zx = _a[8];
-		float zy = _a[9];
-		float zz = _a[10];
-		float zw = _a[11];
-		float wx = _a[12];
-		float wy = _a[13];
-		float wz = _a[14];
-		float ww = _a[15];
+		const float xx = _a[0];
+		const float xy = _a[1];
+		const float xz = _a[2];
+		const float xw = _a[3];
+		const float yx = _a[4];
+		const float yy = _a[5];
+		const float yz = _a[6];
+		const float yw = _a[7];
+		const float zx = _a[8];
+		const float zy = _a[9];
+		const float zz = _a[10];
+		const float zw = _a[11];
+		const float wx = _a[12];
+		const float wy = _a[13];
+		const float wz = _a[14];
+		const float ww = _a[15];
 
-		_result[0] = +(yy*(zz*ww - wz * zw) - yz * (zy*ww - wy * zw) + yw * (zy*wz - wy * zz));
-		_result[1] = -(yx*(zz*ww - wz * zw) - yz * (zx*ww - wx * zw) + yw * (zx*wz - wx * zz));
-		_result[2] = +(yx*(zy*ww - wy * zw) - yy * (zx*ww - wx * zw) + yw * (zx*wy - wx * zy));
-		_result[3] = -(yx*(zy*wz - wy * zz) - yy * (zx*wz - wx * zz) + yz * (zx*wy - wx * zy));
+		_result[ 0] = +(yy*(zz*ww - wz * zw) - yz * (zy*ww - wy * zw) + yw * (zy*wz - wy * zz) );
+		_result[ 1] = -(yx*(zz*ww - wz * zw) - yz * (zx*ww - wx * zw) + yw * (zx*wz - wx * zz) );
+		_result[ 2] = +(yx*(zy*ww - wy * zw) - yy * (zx*ww - wx * zw) + yw * (zx*wy - wx * zy) );
+		_result[ 3] = -(yx*(zy*wz - wy * zz) - yy * (zx*wz - wx * zz) + yz * (zx*wy - wx * zy) );
 
-		_result[4] = -(xy*(zz*ww - wz * zw) - xz * (zy*ww - wy * zw) + xw * (zy*wz - wy * zz));
-		_result[5] = +(xx*(zz*ww - wz * zw) - xz * (zx*ww - wx * zw) + xw * (zx*wz - wx * zz));
-		_result[6] = -(xx*(zy*ww - wy * zw) - xy * (zx*ww - wx * zw) + xw * (zx*wy - wx * zy));
-		_result[7] = +(xx*(zy*wz - wy * zz) - xy * (zx*wz - wx * zz) + xz * (zx*wy - wx * zy));
+		_result[ 4] = -(xy*(zz*ww - wz * zw) - xz * (zy*ww - wy * zw) + xw * (zy*wz - wy * zz) );
+		_result[ 5] = +(xx*(zz*ww - wz * zw) - xz * (zx*ww - wx * zw) + xw * (zx*wz - wx * zz) );
+		_result[ 6] = -(xx*(zy*ww - wy * zw) - xy * (zx*ww - wx * zw) + xw * (zx*wy - wx * zy) );
+		_result[ 7] = +(xx*(zy*wz - wy * zz) - xy * (zx*wz - wx * zz) + xz * (zx*wy - wx * zy) );
 
-		_result[8] = +(xy*(yz*ww - wz * yw) - xz * (yy*ww - wy * yw) + xw * (yy*wz - wy * yz));
-		_result[9] = -(xx*(yz*ww - wz * yw) - xz * (yx*ww - wx * yw) + xw * (yx*wz - wx * yz));
-		_result[10] = +(xx*(yy*ww - wy * yw) - xy * (yx*ww - wx * yw) + xw * (yx*wy - wx * yy));
-		_result[11] = -(xx*(yy*wz - wy * yz) - xy * (yx*wz - wx * yz) + xz * (yx*wy - wx * yy));
+		_result[ 8] = +(xy*(yz*ww - wz * yw) - xz * (yy*ww - wy * yw) + xw * (yy*wz - wy * yz) );
+		_result[ 9] = -(xx*(yz*ww - wz * yw) - xz * (yx*ww - wx * yw) + xw * (yx*wz - wx * yz) );
+		_result[10] = +(xx*(yy*ww - wy * yw) - xy * (yx*ww - wx * yw) + xw * (yx*wy - wx * yy) );
+		_result[11] = -(xx*(yy*wz - wy * yz) - xy * (yx*wz - wx * yz) + xz * (yx*wy - wx * yy) );
 
-		_result[12] = -(xy*(yz*zw - zz * yw) - xz * (yy*zw - zy * yw) + xw * (yy*zz - zy * yz));
-		_result[13] = +(xx*(yz*zw - zz * yw) - xz * (yx*zw - zx * yw) + xw * (yx*zz - zx * yz));
-		_result[14] = -(xx*(yy*zw - zy * yw) - xy * (yx*zw - zx * yw) + xw * (yx*zy - zx * yy));
-		_result[15] = +(xx*(yy*zz - zy * yz) - xy * (yx*zz - zx * yz) + xz * (yx*zy - zx * yy));
+		_result[12] = -(xy*(yz*zw - zz * yw) - xz * (yy*zw - zy * yw) + xw * (yy*zz - zy * yz) );
+		_result[13] = +(xx*(yz*zw - zz * yw) - xz * (yx*zw - zx * yw) + xw * (yx*zz - zx * yz) );
+		_result[14] = -(xx*(yy*zw - zy * yw) - xy * (yx*zw - zx * yw) + xw * (yx*zy - zx * yy) );
+		_result[15] = +(xx*(yy*zz - zy * yz) - xy * (yx*zz - zx * yz) + xz * (yx*zy - zx * yy) );
 	}
 
 	void calcLinearFit2D(float _result[2], const void* _points, uint32_t _stride, uint32_t _numPoints)
diff --git a/tests/uint32_test.cpp b/tests/uint32_test.cpp
index a3e3d07..b209219 100644
--- a/tests/uint32_test.cpp
+++ b/tests/uint32_test.cpp
@@ -33,6 +33,7 @@ TEST_CASE("uint32_cnt")
 	REQUIRE( 0 == bx::uint32_cnttz<uint8_t >(1) );
 	REQUIRE( 7 == bx::uint32_cnttz<uint8_t >(1<<7) );
 	REQUIRE( 8 == bx::uint32_cnttz<uint8_t >(0) );
+	REQUIRE( 1 == bx::uint32_cnttz<uint8_t >(0x3e) );
 	REQUIRE( 0 == bx::uint32_cnttz<uint16_t>(1) );
 	REQUIRE(15 == bx::uint32_cnttz<uint16_t>(1<<15) );
 	REQUIRE(16 == bx::uint32_cnttz<uint16_t>(0) );
@@ -44,6 +45,7 @@ TEST_CASE("uint32_cnt")
 
 	REQUIRE( 7 == bx::uint32_cntlz<uint8_t >(1) );
 	REQUIRE( 8 == bx::uint32_cntlz<uint8_t >(0) );
+	REQUIRE( 2 == bx::uint32_cntlz<uint8_t >(0x3e) );
 	REQUIRE(15 == bx::uint32_cntlz<uint16_t>(1) );
 	REQUIRE(16 == bx::uint32_cntlz<uint16_t>(0) );
 	REQUIRE(31 == bx::uint32_cntlz<uint32_t>(1) );