diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp
index a555a50..3c7cf89 100644
--- a/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp
+++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp
@@ -23,7 +23,7 @@ class WorldEditorView: public ox::SignalHandler {
 
 	private:
 		studio::StudioContext &m_sctx;
-		ngfx::ContextUPtr m_nctx;
+		ox::UPtr<ngfx::Context> m_nctx;
 		WorldStatic const&m_worldStatic;
 		int m_columns{}, m_rows{};
 		World m_world;
diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp
index 5fa7426..2448403 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.hpp
@@ -20,7 +20,7 @@ namespace ngfx = nostalgia::gfx;
 class CollisionView {
 	private:
 		static constexpr int s_scale = 5;
-		ngfx::ContextUPtr m_nctx;
+		ox::UPtr<ngfx::Context> m_nctx;
 		glutils::FrameBuffer m_frameBuffer;
 		uint_t m_sheetTileStart{};
 		int m_subsheetTilesWidth{};