diff --git a/public/blah/containers/stackvector.h b/public/blah/containers/stackvector.h
index 8eecbb9..28d4f0f 100644
--- a/public/blah/containers/stackvector.h
+++ b/public/blah/containers/stackvector.h
@@ -184,7 +184,7 @@ namespace Blah
 			}
 			else
 			{
-				for (int i = index; i < m_size - 1; i++)
+				for (auto i = index; i < m_size - 1; i++)
 					begin()[i] = std::move(begin()[i + 1]);
 				begin()[m_size - 1].~T();
 			}
diff --git a/public/blah/graphics/material.cpp b/public/blah/graphics/material.cpp
index eaa654f..b14c84f 100644
--- a/public/blah/graphics/material.cpp
+++ b/public/blah/graphics/material.cpp
@@ -167,7 +167,7 @@ void Material::set_value(const char* name, const float* value, int64_t length)
 
 		if (strcmp(uniform.name, name) == 0)
 		{
-			size_t max = calc_uniform_size(uniform);
+			auto max = calc_uniform_size(uniform);
 			if (length > max)
 			{
 				Log::warn("Exceeding length of Uniform '%s' (%i / %i)", name, length, max);
diff --git a/public/blah/math/calc.h b/public/blah/math/calc.h
index e53719a..b33c973 100644
--- a/public/blah/math/calc.h
+++ b/public/blah/math/calc.h
@@ -37,10 +37,10 @@ namespace Blah
 		float abs(float x);
 
 		template<class T, class U>
-		T min(T a, U b) { return a < b ? a : b; }
+		T min(T a, U b) { return  (T)(a < b ? a : b); }
 
 		template<class T, class U>
-		T max(T a, U b) { return a > b ? a : b; }
+		T max(T a, U b) { return (T)(a > b ? a : b); }
 		
 		float floor(float x);