diff --git a/SDK/include/NDK/World.inl b/SDK/include/NDK/World.inl
index d45f0ff1d..0cb0fc7c9 100644
--- a/SDK/include/NDK/World.inl
+++ b/SDK/include/NDK/World.inl
@@ -314,7 +314,8 @@ namespace Ndk
 
 		m_systems = std::move(world.m_systems);
 		for (const auto& systemPtr : m_systems)
-			systemPtr->SetWorld(this);
+			if (systemPtr)
+				systemPtr->SetWorld(this);
 
 		return *this;
 	}
diff --git a/src/Nazara/Utility/SimpleTextDrawer.cpp b/src/Nazara/Utility/SimpleTextDrawer.cpp
index 739af792e..aa7afcf5c 100644
--- a/src/Nazara/Utility/SimpleTextDrawer.cpp
+++ b/src/Nazara/Utility/SimpleTextDrawer.cpp
@@ -396,6 +396,9 @@ namespace Nz
 		m_lines.back().bounds.ExtendTo(m_glyphs.back().bounds);
 
 		m_bounds.Set(Rectf(std::floor(m_workingBounds.x), std::floor(m_workingBounds.y), std::ceil(m_workingBounds.width), std::ceil(m_workingBounds.height)));
+
+		m_colorUpdated = true;
+		m_glyphUpdated = true;
 	}
 
 	void SimpleTextDrawer::OnFontAtlasLayerChanged(const Font* font, AbstractImage* oldLayer, AbstractImage* newLayer)