diff --git a/src/nostalgia/modules/core/src/gba/panic.cpp b/src/nostalgia/modules/core/src/gba/panic.cpp
index bc6169da..b878cf86 100644
--- a/src/nostalgia/modules/core/src/gba/panic.cpp
+++ b/src/nostalgia/modules/core/src/gba/panic.cpp
@@ -48,8 +48,8 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}
 	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.file != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.file, err.line);
+	if (err.src.file_name() != nullptr) {
+		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
 	}
 	// disable all interrupt handling and IntrWait on no interrupts
 	REG_IE = 0;
diff --git a/src/olympic/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioapp.cpp
index 466518ed..6e551546 100644
--- a/src/olympic/studio/applib/src/studioapp.cpp
+++ b/src/olympic/studio/applib/src/studioapp.cpp
@@ -75,7 +75,7 @@ StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexce
 		} else {
 			oxErrf(
 					"Could not open studio config file: {}: {} ({}:{})\n",
-					err.errCode, toStr(err), err.file, err.line);
+					err.errCode, toStr(err), err.src.file_name(), err.src.line());
 		}
 	}
 }
@@ -224,7 +224,7 @@ void StudioUI::drawTabs() noexcept {
 			try {
 				OX_THROW_ERROR(m_editors.erase(it).moveTo(it));
 			} catch (ox::Exception const&ex) {
-				oxErrf("Editor tab deletion failed: {} ({}:{})\n", ex.what(), ex.file, ex.line);
+				oxErrf("Editor tab deletion failed: {} ({}:{})\n", ex.what(), ex.src.file_name(), ex.src.line());
 			} catch (std::exception const&ex) {
 				oxErrf("Editor tab deletion failed: {}\n", ex.what());
 			}
@@ -376,7 +376,7 @@ ox::Error StudioUI::openFileActiveTab(ox::StringViewCR path, bool makeActiveTab)
 		if constexpr(!ox::defines::Debug) {
 			oxErrf("Could not open Editor: {}\n", toStr(err));
 		} else {
-			oxErrf("Could not open Editor: {} ({}:{})\n", err.errCode, err.file, err.line);
+			oxErrf("Could not open Editor: {} ({}:{})\n", err.errCode, err.src.file_name(), err.src.line());
 		}
 		return err;
 	}
diff --git a/src/olympic/studio/modlib/include/studio/undocommand.hpp b/src/olympic/studio/modlib/include/studio/undocommand.hpp
index ffd00091..6f41d0df 100644
--- a/src/olympic/studio/modlib/include/studio/undocommand.hpp
+++ b/src/olympic/studio/modlib/include/studio/undocommand.hpp
@@ -13,7 +13,7 @@ namespace studio {
 class NoChangesException: public ox::Exception {
 	public:
 		inline NoChangesException(std::source_location sloc = std::source_location::current()):
-				ox::Exception(sloc.file_name(), sloc.line(), 1, "Command makes no changes.") {}
+				ox::Exception(1, "Command makes no changes.", sloc) {}
 };
 
 class UndoCommand {
diff --git a/src/olympic/studio/modlib/src/editor.cpp b/src/olympic/studio/modlib/src/editor.cpp
index 27f52dfb..de5e6527 100644
--- a/src/olympic/studio/modlib/src/editor.cpp
+++ b/src/olympic/studio/modlib/src/editor.cpp
@@ -46,7 +46,7 @@ void BaseEditor::save() noexcept {
 		setUnsavedChanges(false);
 	} else {
 		if constexpr(ox::defines::Debug) {
-			oxErrorf("Could not save file {}: {} ({}:{})", itemPath(), toStr(err), err.file, err.line);
+			oxErrorf("Could not save file {}: {} ({}:{})", itemPath(), toStr(err), err.src.file_name(), err.src.line());
 		} else {
 			oxErrorf("Could not save file {}: {}", itemPath(), toStr(err));
 		}