diff --git a/src/Nazara/Graphics/Graphics.cpp b/src/Nazara/Graphics/Graphics.cpp
index 60c0315c9..04f7eac4b 100644
--- a/src/Nazara/Graphics/Graphics.cpp
+++ b/src/Nazara/Graphics/Graphics.cpp
@@ -180,7 +180,7 @@ namespace Nz
 				const std::shared_ptr<Font>& defaultFont = Font::GetDefault();
 				defaultFont->SetAtlas(nullptr);
 
-				if (!defaultAtlas.use_count() > 1)
+				if (defaultAtlas.use_count() >= 1)
 				{
 					// Still not the only one to own it ? Then crap.
 					NazaraWarning("Default font atlas uses hardware storage and is still used");
diff --git a/src/Nazara/Utility/Font.cpp b/src/Nazara/Utility/Font.cpp
index d045f8970..af2624b4c 100644
--- a/src/Nazara/Utility/Font.cpp
+++ b/src/Nazara/Utility/Font.cpp
@@ -49,10 +49,14 @@ namespace Nz
 			else
 			{
 				// At least one font is using this atlas, remove our glyphes
-				for (auto&& [_, glyphMap] : m_glyphes)
+				for (auto&& [glyphKey, glyphMap] : m_glyphes)
 				{
-					for (auto&& [_, glyph] : glyphMap)
+					NazaraUnused(glyphKey);
+					for (auto&& [character, glyph] : glyphMap)
+					{
+						NazaraUnused(character);
 						m_atlas->Free(&glyph.atlasRect, &glyph.layerIndex, 1);
+					}
 				}
 
 				// Free all cached glyphes