diff --git a/examples/AnimatedMesh/build.lua b/examples/AnimatedMesh/build.lua
index ec434dd22..18ee3ebd4 100644
--- a/examples/AnimatedMesh/build.lua
+++ b/examples/AnimatedMesh/build.lua
@@ -16,21 +16,25 @@ if (_OPTIONS["united"]) then
 		links "NazaraEngine"
 else
 	configuration "DebugStatic"
+		links "Nazara3D-s-d"
 		links "NazaraRenderer-s-d"
 		links "NazaraUtility-s-d"
 		links "NazaraCore-s-d"
 
 	configuration "ReleaseStatic"
+		links "Nazara3D-s"
 		links "NazaraRenderer-s"
 		links "NazaraUtility-s"
 		links "NazaraCore-s"
 
 	configuration "DebugDLL"
+		links "Nazara3D-d"
 		links "NazaraRenderer-d"
 		links "NazaraUtility-d"
 		links "NazaraCore-d"
 
 	configuration "ReleaseDLL"
+		links "Nazara3D"
 		links "NazaraRenderer"
 		links "NazaraUtility"
 		links "NazaraCore"
diff --git a/include/Nazara/Core/Resource.hpp b/include/Nazara/Core/Resource.hpp
index 0da8c78c3..f5da1ce10 100644
--- a/include/Nazara/Core/Resource.hpp
+++ b/include/Nazara/Core/Resource.hpp
@@ -50,7 +50,7 @@ class NAZARA_API NzResource
 		void RemoveResourceListener(NzResourceListener* listener) const;
 		void RemoveResourceReference() const;
 
-		void SetPersistent(bool persistent = true);
+		void SetPersistent(bool persistent = true, bool checkReferenceCount = true);
 
 	protected:
 		void NotifyCreated();
diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl
index 135d7584c..ccc2e228f 100644
--- a/include/Nazara/Math/Matrix4.inl
+++ b/include/Nazara/Math/Matrix4.inl
@@ -590,9 +590,9 @@ NzMatrix4<T>& NzMatrix4<T>::MakeZero()
 
 template<typename T>
 NzMatrix4<T>& NzMatrix4<T>::Set(T r11, T r12, T r13, T r14,
-					   T r21, T r22, T r23, T r24,
-					   T r31, T r32, T r33, T r34,
-					   T r41, T r42, T r43, T r44)
+                                T r21, T r22, T r23, T r24,
+                                T r31, T r32, T r33, T r34,
+                                T r41, T r42, T r43, T r44)
 {
 	m11 = r11;
 	m12 = r12;
@@ -626,9 +626,7 @@ NzMatrix4<T>& NzMatrix4<T>::Set(const T matrix[16])
 template<typename T>
 NzMatrix4<T>& NzMatrix4<T>::Set(const NzMatrix4& matrix)
 {
-	NazaraError("Check 1");
 	std::memcpy(&m11, &matrix.m11, 16*sizeof(T));
-	NazaraError("Check 2");
 
 	return *this;
 }
diff --git a/src/Nazara/Core/Error.cpp b/src/Nazara/Core/Error.cpp
index 302b12e88..53e1ae9d4 100644
--- a/src/Nazara/Core/Error.cpp
+++ b/src/Nazara/Core/Error.cpp
@@ -20,7 +20,7 @@ void NzError(nzErrorType type, const NzString& error, unsigned int line, const c
 
 	#if NAZARA_CORE_EXIT_ON_ASSERT_FAILURE
 	if (type == nzErrorType_AssertFailed)
-		exit(EXIT_FAILURE);
+		std::exit(EXIT_FAILURE);
 	#endif
 }
 
@@ -56,7 +56,7 @@ NzString NzGetLastSystemError(unsigned int code)
 
 	return error;
 	#elif defined(NAZARA_PLATFORM_POSIX)
-	return strerror(code);
+	return std::strerror(code);
 	#else
 		#error GetLastSystemError is not implemented on this platform
 
diff --git a/src/Nazara/Core/Resource.cpp b/src/Nazara/Core/Resource.cpp
index 1cea4eb37..389eb57d3 100644
--- a/src/Nazara/Core/Resource.cpp
+++ b/src/Nazara/Core/Resource.cpp
@@ -6,6 +6,7 @@
 #include <Nazara/Core/Config.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ResourceListener.hpp>
+#include <typeinfo>
 #include <Nazara/Core/Debug.hpp>
 
 NzResource::NzResource(bool persistent) :
@@ -111,13 +112,13 @@ void NzResource::RemoveResourceReference() const
 	}
 }
 
-void NzResource::SetPersistent(bool persistent)
+void NzResource::SetPersistent(bool persistent, bool checkReferenceCount)
 {
 	NazaraMutexLock(m_mutex);
 
 	m_resourcePersistent = persistent;
 
-	if (!persistent && m_resourceReferenceCount == 0)
+	if (checkReferenceCount && !persistent && m_resourceReferenceCount == 0)
 	{
 		NazaraMutexUnlock(m_mutex);
 		delete this;