diff --git a/include/Nazara/Core/ModuleBase.inl b/include/Nazara/Core/ModuleBase.inl
index 8a8006111..ce61b8f0a 100644
--- a/include/Nazara/Core/ModuleBase.inl
+++ b/include/Nazara/Core/ModuleBase.inl
@@ -45,7 +45,11 @@ namespace Nz
 	template<typename T>
 	void ModuleBase<T>::LogUninit()
 	{
-		NazaraNotice("Uninitializing " + m_moduleName + "...");
+		if (m_moduleName.empty())
+			return;
+
+		NazaraNotice("Uninitialized " + m_moduleName);
+		m_moduleName.clear();
 	}
 }
 
diff --git a/include/Nazara/Renderer/RenderFrame.inl b/include/Nazara/Renderer/RenderFrame.inl
index e361a0277..f501290f0 100644
--- a/include/Nazara/Renderer/RenderFrame.inl
+++ b/include/Nazara/Renderer/RenderFrame.inl
@@ -57,4 +57,3 @@ namespace Nz
 }
 
 #include <Nazara/Renderer/DebugOff.hpp>
-#include "RenderFrame.hpp"
diff --git a/src/Nazara/Core/Core.cpp b/src/Nazara/Core/Core.cpp
index e1cd2862a..02e2e013d 100644
--- a/src/Nazara/Core/Core.cpp
+++ b/src/Nazara/Core/Core.cpp
@@ -29,11 +29,11 @@ namespace Nz
 
 	Core::~Core()
 	{
-		LogUninit();
 		HardwareInfo::Uninitialize();
-		Log::Uninitialize();
 		PluginManager::Uninitialize();
 		TaskScheduler::Uninitialize();
+		LogUninit();
+		Log::Uninitialize();
 	}
 
 	Core* Core::s_instance = nullptr;
diff --git a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.vert.nzsl b/src/Nazara/Graphics/Resources/Shaders/basicmaterial.vert.nzsl
deleted file mode 100644
index 5e8fb6330..000000000
--- a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.vert.nzsl
+++ /dev/null
@@ -1,55 +0,0 @@
-[layout(std140)]
-struct BasicSettings
-{
-	AlphaThreshold: f32,
-	DiffuseColor: vec4<f32>
-}
-
-[layout(std140)]
-struct InstanceData
-{
-	worldMatrix: mat4<f32>,
-	invWorldMatrix: mat4<f32>
-}
-
-[layout(std140)]
-struct ViewerData
-{
-	projectionMatrix: mat4<f32>,
-	invProjectionMatrix: mat4<f32>,
-	viewMatrix: mat4<f32>,
-	invViewMatrix: mat4<f32>,
-	viewProjMatrix: mat4<f32>,
-	invViewProjMatrix: mat4<f32>,
-	renderTargetSize: vec2<f32>,
-	invRenderTargetSize: vec2<f32>,
-	eyePosition: vec3<f32>
-}
-
-external
-{
-	[set(0), binding(0)] viewerData: uniform<ViewerData>,
-	[set(1), binding(0)] instanceData: uniform<InstanceData>,
-	[set(2), binding(0)] settings: uniform<BasicSettings>
-}
-
-struct InputData
-{
-	[location(0)] inPos: vec3<f32>,
-	[location(1)] inTexCoord: vec2<f32>
-}
-
-struct OutputData
-{
-	[location(0)] vertUV: vec2<f32>,
-	[builtin(position)] position: vec4<f32>
-}
-
-[entry(vert)]
-fn main(input: InputData) -> OutputData
-{
-	let output: OutputData;
-	output.vertUV = input.inTexCoord;
-	output.position = ((viewerData.projectionMatrix * viewerData.viewMatrix) * instanceData.worldMatrix) * (vec4<f32>(input.inPos, 1.000000));
-	return output;
-}