diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp
index 1269c747c..a386d10d8 100644
--- a/src/Nazara/Core/String.cpp
+++ b/src/Nazara/Core/String.cpp
@@ -3958,12 +3958,12 @@ NzString NzString::Number(unsigned long long number, nzUInt8 radix)
 
 NzString NzString::Pointer(const void* ptr)
 {
-	const unsigned int size = sizeof(void*)*2 + 2;
+	const unsigned int capacity = sizeof(void*)*2 + 2;
 
-	char* str = new char[size+1];
-	std::sprintf(str, "0x%p", ptr);
+	char* str = new char[capacity+1];
+	int size = std::sprintf(str, "0x%p", ptr);
 
-	return NzString(new SharedString(1, size, size, str));
+	return NzString(new SharedString(1, capacity, size, str));
 }
 
 NzString NzString::Unicode(char32_t character)
diff --git a/src/Nazara/Core/StringStream.cpp b/src/Nazara/Core/StringStream.cpp
index 9eb4494ff..0871ec871 100644
--- a/src/Nazara/Core/StringStream.cpp
+++ b/src/Nazara/Core/StringStream.cpp
@@ -166,7 +166,7 @@ NzStringStream& NzStringStream::operator<<(const NzString& string)
 NzStringStream& NzStringStream::operator<<(const void* ptr)
 {
 	m_strings.push_back(NzString::Pointer(ptr));
-	m_bufferSize += sizeof(void*)*2;
+	m_bufferSize += m_strings.back().GetSize();
 
 	return *this;
 }
diff --git a/src/Nazara/Utility/Algorithm.cpp b/src/Nazara/Utility/Algorithm.cpp
index 28f1daf9d..5363c366d 100644
--- a/src/Nazara/Utility/Algorithm.cpp
+++ b/src/Nazara/Utility/Algorithm.cpp
@@ -247,18 +247,18 @@ namespace
 				m_misses = 0;
 			}
 
-			int GetMissCount()
+			int GetMissCount() const
 			{
 				return m_misses;
 			}
 
-			int GetVertex(int which)
+			int GetVertex(int which) const
 			{
 				return m_cache[which];
 			}
 
 		private:
-			int FindVertex(int v)
+			int FindVertex(int v) const
 			{
 				for (int i = 0; i < 32; ++i)
 				{
@@ -328,9 +328,9 @@ namespace
 			}
 
 		private:
-			float CalculateVertexScore(unsigned int vertex)
+			float CalculateVertexScore(unsigned int vertex) const
 			{
-				VertexCacheData *v = &m_vertices[vertex];
+				const VertexCacheData* v = &m_vertices[vertex];
 				if (v->remaining_valence <= 0)
 					// No tri needs this vertex!
 					return -1.0f;
@@ -545,7 +545,7 @@ namespace
 				float sum = 0.f;
 				for (unsigned int i = 0; i < 3; ++i)
 				{
-					VertexCacheData *v = &m_vertices[t->verts[i]];
+					VertexCacheData* v = &m_vertices[t->verts[i]];
 					float sc = v->current_score;
 					if (!v->calculated)
 						sc = CalculateVertexScore(t->verts[i]);
@@ -572,13 +572,13 @@ namespace
 					if (vert < 0)
 						continue;
 
-					VertexCacheData *v = &m_vertices[vert];
+					const VertexCacheData* v = &m_vertices[vert];
 
 					// iterate through all *active* triangles of this vertex
-					for (int j=0; j<v->remaining_valence; j++)
+					for (int j = 0; j < v->remaining_valence; j++)
 					{
 						int tri = v->tri_indices[j];
-						TriangleCacheData *t = &m_triangles[tri];
+						TriangleCacheData* t = &m_triangles[tri];
 						if (!t->calculated)
 							// calculate triangle score
 							TriangleScoreRecalculation(tri);
diff --git a/tests/Nazara/Core/StringStream.cpp b/tests/Nazara/Core/StringStream.cpp
index 62f0b794e..b32b0ec32 100644
--- a/tests/Nazara/Core/StringStream.cpp
+++ b/tests/Nazara/Core/StringStream.cpp
@@ -65,7 +65,7 @@ SCENARIO("StringStream", "[CORE][STRINGSTREAM]")
 			stringstream << NzString("3");
 			stringstream << static_cast<void*>(nullptr);
 
-			REQUIRE(stringstream.ToString() == (NzString("default3330x") + NzString(sizeof(void*) * 2, "0")));
+			REQUIRE(stringstream.ToString() == (NzString("default333") + NzString::Pointer(nullptr)));
 		}
 	}
 }
diff --git a/tests/Nazara/Math/EulerAngles.cpp b/tests/Nazara/Math/EulerAngles.cpp
index 6a4508179..fd16e70a9 100644
--- a/tests/Nazara/Math/EulerAngles.cpp
+++ b/tests/Nazara/Math/EulerAngles.cpp
@@ -48,9 +48,9 @@ SCENARIO("EulerAngles", "[MATH][EULERANGLES]")
 		{
 			THEN("These results are expected")
 			{
-				REQUIRE(NzEulerAnglesf(NzFromDegrees(45.f), 0.f, 0.f) == NzQuaternionf(0.923879504204f, 0.382683455944f, 0.f, 0.f).ToEulerAngles());
-				REQUIRE(NzEulerAnglesf(0.f, NzFromDegrees(45.f), 0.f) == NzQuaternionf(0.923879504204f, 0.f, 0.382683455944f, 0.f).ToEulerAngles());
-				//REQUIRE(NzEulerAnglesf(0.f, 0.f, NzFromDegrees(45.f)) == NzQuaternionf(0.923879504204f, 0.f, 0.f, 0.382683455944f).ToEulerAngles());
+				REQUIRE(NzEulerAngles<int>(NzFromDegrees(45.f), 0.f, 0.f) == NzEulerAngles<int>(NzQuaternionf(0.923879504204f, 0.382683455944f, 0.f, 0.f).ToEulerAngles()));
+				REQUIRE(NzEulerAngles<int>(0.f, NzFromDegrees(45.f), 0.f) == NzEulerAngles<int>(NzQuaternionf(0.923879504204f, 0.f, 0.382683455944f, 0.f).ToEulerAngles()));
+				REQUIRE(NzEulerAngles<int>(0.f, 0.f, NzFromDegrees(45.f)) == NzEulerAngles<int>(NzQuaternionf(0.923879504204f, 0.f, 0.f, 0.382683455944f).ToEulerAngles()));
 			}
 		}
 	}
diff --git a/tests/Nazara/Math/OrientedBox.cpp b/tests/Nazara/Math/OrientedBox.cpp
index c5b650c7d..50633002f 100644
--- a/tests/Nazara/Math/OrientedBox.cpp
+++ b/tests/Nazara/Math/OrientedBox.cpp
@@ -9,6 +9,7 @@ SCENARIO("OrientedBox", "[MATH][ORIENTEDBOX]")
 		NzOrientedBoxf secondCenterAndUnit(NzOrientedBox<int>(NzVector3i::Zero(), NzVector3i::Unit()));
 
 		firstCenterAndUnit.Update(NzMatrix4f::Identity());
+		secondCenterAndUnit.Update(NzMatrix4f::Identity());
 
 		WHEN("We compare them")
 		{
diff --git a/tests/Nazara/Math/Quaternion.cpp b/tests/Nazara/Math/Quaternion.cpp
index 7ce748cbf..fd2445772 100644
--- a/tests/Nazara/Math/Quaternion.cpp
+++ b/tests/Nazara/Math/Quaternion.cpp
@@ -147,7 +147,11 @@ SCENARIO("Quaternion", "[MATH][QUATERNION]")
 				NzQuaternionf quaterionB(NzFromDegrees(45.f), NzVector3f::UnitZ());
 				NzQuaternionf quaternionC = NzQuaternionf::Slerp(quaterionA, quaterionB, 0.5f);
 
-				REQUIRE(quaternionC == NzQuaternionf(NzFromDegrees(22.5f), NzVector3f::UnitZ()));
+				NzQuaternionf unitZ225(NzFromDegrees(22.5f), NzVector3f::UnitZ());
+				REQUIRE(quaternionC.w == Approx(unitZ225.w));
+				REQUIRE(quaternionC.x == Approx(unitZ225.x));
+				REQUIRE(quaternionC.y == Approx(unitZ225.y));
+				REQUIRE(quaternionC.z == Approx(unitZ225.z));
 			}
 		}
 	}