diff --git a/src/olympic/studio/applib/src/clawviewer.cpp b/src/olympic/studio/applib/src/clawviewer.cpp
index 0bb859e9..b50b5aeb 100644
--- a/src/olympic/studio/applib/src/clawviewer.cpp
+++ b/src/olympic/studio/applib/src/clawviewer.cpp
@@ -4,6 +4,8 @@
 
 #include <imgui.h>
 
+#include <studio/context.hpp>
+
 #include "clawviewer.hpp"
 
 namespace studio {
diff --git a/src/olympic/studio/applib/src/subcommands/change-format/change-format.cpp b/src/olympic/studio/applib/src/subcommands/change-format/change-format.cpp
index ba2c9d2e..53d75dad 100644
--- a/src/olympic/studio/applib/src/subcommands/change-format/change-format.cpp
+++ b/src/olympic/studio/applib/src/subcommands/change-format/change-format.cpp
@@ -16,12 +16,9 @@ static ox::Error convertFile(
 	ox::TypeStore &ts,
 	ox::StringViewCR path,
 	ox::ClawFormat const fmt) noexcept {
-	ox::Buffer buff;
-	ox::ModelObject obj;
-	ox::UUID uuid;
-	OX_RETURN_ERROR(fs.read(path).moveTo(buff).reoriginate(1, "unable to read file"));
-	OX_RETURN_ERROR(keel::readUuidHeader(buff).moveTo(uuid));
-	OX_RETURN_ERROR(keel::readAsset(ts, buff).moveTo(obj).reoriginate(1, "unable to parse file"));
+	OX_REQUIRE_M(buff, fs.read(path).reoriginate(1, "unable to read file"));
+	OX_REQUIRE(uuid, keel::readUuidHeader(buff));
+	OX_REQUIRE(obj, keel::readAsset(ts, buff).reoriginate(1, "unable to parse file"));
 	buff.clear();
 	ox::BufferWriter wrtr{&buff};
 	OX_RETURN_ERROR(keel::writeUuidHeader(wrtr, uuid));