diff --git a/src/nostalgia/modules/gfx/src/gba/context.cpp b/src/nostalgia/modules/gfx/src/gba/context.cpp
index fd9c1106..d3a358d2 100644
--- a/src/nostalgia/modules/gfx/src/gba/context.cpp
+++ b/src/nostalgia/modules/gfx/src/gba/context.cpp
@@ -22,7 +22,7 @@ ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
 ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
 	auto ctx = ox::make_unique<Context>(tctx);
 	OX_RETURN_ERROR(initGfx(*ctx, params));
-	return ox::UPtr<Context>(std::move(ctx));
+	return ctx;
 }
 
 keel::Context &keelCtx(Context &ctx) noexcept {
diff --git a/src/nostalgia/modules/gfx/src/opengl/context.cpp b/src/nostalgia/modules/gfx/src/opengl/context.cpp
index 7c6e2da9..3bb6486b 100644
--- a/src/nostalgia/modules/gfx/src/opengl/context.cpp
+++ b/src/nostalgia/modules/gfx/src/opengl/context.cpp
@@ -26,7 +26,7 @@ Context::~Context() noexcept {
 ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
 	auto ctx = ox::make_unique<Context>(tctx, params);
 	OX_RETURN_ERROR(initGfx(*ctx, params));
-	return ox::UPtr<Context>(ctx.release());
+	return ctx;
 }
 
 keel::Context &keelCtx(Context &ctx) noexcept {
diff --git a/src/nostalgia/modules/gfx/src/opengl/gfx.cpp b/src/nostalgia/modules/gfx/src/opengl/gfx.cpp
index 3d3d8f35..efbe6868 100644
--- a/src/nostalgia/modules/gfx/src/opengl/gfx.cpp
+++ b/src/nostalgia/modules/gfx/src/opengl/gfx.cpp
@@ -571,7 +571,7 @@ static ox::Result<TileSheetData> buildSetTsd(
 
 static void copyPixels(
 		CompactTileSheet const&ts,
-		ox::Span<uint32_t> dst,
+		ox::Span<uint32_t> const dst,
 		size_t const srcPxIdx,
 		size_t const pxlCnt) noexcept {
 	size_t idx{};