diff --git a/src/Nazara/Graphics/LightManager.cpp b/src/Nazara/Graphics/LightManager.cpp
index 107a170bc..8153e7d2a 100644
--- a/src/Nazara/Graphics/LightManager.cpp
+++ b/src/Nazara/Graphics/LightManager.cpp
@@ -37,10 +37,10 @@ unsigned int NzLightManager::ComputeClosestLights(const NzVector3f& position, fl
 		light.score = std::numeric_limits<unsigned int>::max(); // Nous jouons au Golf
 	}
 
-	for (unsigned int i = 0; i < m_lights.size(); ++i)
+	for (auto it = m_lights.begin(); it != m_lights.end(); ++it)
 	{
-		const NzLight** lights = m_lights[i].first;
-		unsigned int lightCount = m_lights[i].second;
+		const NzLight** lights = it->first;
+		unsigned int lightCount = it->second;
 
 		for (unsigned int j = 0; j < lightCount; ++j)
 		{
diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp
index 476800edf..ef9e096d9 100644
--- a/src/Nazara/Renderer/OpenGL.cpp
+++ b/src/Nazara/Renderer/OpenGL.cpp
@@ -1941,8 +1941,8 @@ GLenum NzOpenGL::CubemapFace[] =
 {
 	GL_TEXTURE_CUBE_MAP_POSITIVE_X, // nzCubemapFace_PositiveX
 	GL_TEXTURE_CUBE_MAP_NEGATIVE_X, // nzCubemapFace_NegativeX
-	GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, // nzCubemapFace_PositiveY (Inversion pour les standards OpenGL)
-	GL_TEXTURE_CUBE_MAP_POSITIVE_Y, // nzCubemapFace_NegativeY (Inversion pour les standards OpenGL)
+	GL_TEXTURE_CUBE_MAP_POSITIVE_Y, // nzCubemapFace_PositiveY
+	GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, // nzCubemapFace_NegativeY
 	GL_TEXTURE_CUBE_MAP_POSITIVE_Z, // nzCubemapFace_PositiveZ
 	GL_TEXTURE_CUBE_MAP_NEGATIVE_Z  // nzCubemapFace_NegativeZ
 };
diff --git a/src/Nazara/Renderer/Texture.cpp b/src/Nazara/Renderer/Texture.cpp
index e19ef2bbf..cb5b4ff45 100644
--- a/src/Nazara/Renderer/Texture.cpp
+++ b/src/Nazara/Renderer/Texture.cpp
@@ -468,7 +468,7 @@ NzVector2ui NzTexture::GetSize() const
 	if (!m_impl)
 	{
 		NazaraError("Texture must be valid");
-		return 0;
+		return NzVector2ui(0, 0);
 	}
 	#endif
 
diff --git a/src/Nazara/Utility/Algorithm.cpp b/src/Nazara/Utility/Algorithm.cpp
index 628444000..e22f937fa 100644
--- a/src/Nazara/Utility/Algorithm.cpp
+++ b/src/Nazara/Utility/Algorithm.cpp
@@ -189,11 +189,9 @@ namespace
 		void MoveTriangleToEnd(int tri)
 		{
 			auto it = std::find(tri_indices.begin(), tri_indices.end(), tri);
-			int t_ind = (it != tri_indices.end()) ? std::distance(tri_indices.begin(), it) : -1;
+			NazaraAssert(it != tri_indices.end(), "Triangle not found");
 
-			NazaraAssert(t_ind >= 0, "Triangle not found");
-
-			tri_indices.erase(tri_indices.begin() + t_ind, tri_indices.begin() + t_ind + 1);
+			tri_indices.erase(it);
 			tri_indices.push_back(tri);
 		}
 	};
diff --git a/src/Nazara/Utility/Utility.cpp b/src/Nazara/Utility/Utility.cpp
index df38b312c..885e4a578 100644
--- a/src/Nazara/Utility/Utility.cpp
+++ b/src/Nazara/Utility/Utility.cpp
@@ -146,7 +146,7 @@ unsigned int NzUtility::ComponentCount[nzComponentType_Max+1] =
 
 static_assert(nzComponentType_Max+1 == 14, "Component count array is incomplete");
 
-unsigned int NzUtility::ComponentStride[nzComponentType_Max+1] =
+std::size_t NzUtility::ComponentStride[nzComponentType_Max+1] =
 {
 	4*sizeof(nzUInt8),  // nzComponentType_Color
 	1*sizeof(double),   // nzComponentType_Double1