diff --git a/SDK/src/NDK/Entity.cpp b/SDK/src/NDK/Entity.cpp
index ce72aca62..d88556a31 100644
--- a/SDK/src/NDK/Entity.cpp
+++ b/SDK/src/NDK/Entity.cpp
@@ -158,11 +158,16 @@ namespace Ndk
 		}
 		m_systemBits.Clear();
 
-		UnregisterAllHandles();
+		// We properly destroy each component
+		for (std::size_t i = m_componentBits.FindFirst(); i != m_componentBits.npos; i = m_componentBits.FindNext(i))
+			m_components[i]->SetEntity(nullptr);
 
 		m_components.clear();
 		m_componentBits.Reset();
 
+		// And then free every handle
+		UnregisterAllHandles();
+
 		m_valid = false;
 	}
 
diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp
index a0bca5d64..7ea8c7df2 100644
--- a/src/Nazara/Core/String.cpp
+++ b/src/Nazara/Core/String.cpp
@@ -5102,10 +5102,14 @@ namespace Nz
 	*/
 	String String::FormatVA(const char* format, va_list args)
 	{
+		// Copy va_list to use it twice
+		va_list args2;
+		va_copy(args2, args);
+
 		std::size_t length = std::vsnprintf(nullptr, 0, format, args);
 
 		auto str = std::make_shared<SharedString>(length);
-		std::vsnprintf(str->string.get(), length + 1, format, args);
+		std::vsnprintf(str->string.get(), length + 1, format, args2);
 
 		return String(std::move(str));
 	}
diff --git a/src/Nazara/Network/UdpSocket.cpp b/src/Nazara/Network/UdpSocket.cpp
index 145257afc..bc86f8401 100644
--- a/src/Nazara/Network/UdpSocket.cpp
+++ b/src/Nazara/Network/UdpSocket.cpp
@@ -17,6 +17,12 @@
 
 namespace Nz
 {
+	/*!
+	* \ingroup network
+	* \class Nz::UdpSocket
+	* \brief Network class that represents a UDP socket, allowing for sending/receiving datagrams.
+	*/
+
 	/*!
 	* \brief Binds a specific IpAddress
 	* \return State of the socket