diff --git a/src/nostalgia/modules/core/src/gba/panic.cpp b/src/nostalgia/modules/core/src/gba/panic.cpp
index 4a6bc235..67eaa702 100644
--- a/src/nostalgia/modules/core/src/gba/panic.cpp
+++ b/src/nostalgia/modules/core/src/gba/panic.cpp
@@ -32,7 +32,7 @@ void panic(const char *file, int line, const char *panicMsg, ox::Error const&err
 	std::ignore = initConsole(*ctx);
 	setBgStatus(*ctx, 0, true);
 	clearBg(*ctx, 0);
-	ox::BString<23> serr = "Error code: ";
+	ox::IString<23> serr = "Error code: ";
 	serr += static_cast<int64_t>(err);
 	puts(*ctx, 32 + 1,  1, "SADNESS...");
 	puts(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp
index 7c41bb4f..4503eefc 100644
--- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp
+++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp
@@ -13,7 +13,7 @@ core::PaletteChangeCommand::PaletteChangeCommand(
 		m_img(img),
 		m_idx(std::move(idx)),
 		m_oldPalette(m_img.defaultPalette),
-		m_newPalette(ox::FileAddress(ox::sfmt<ox::BString<43>>("uuid://{}", newPalette))) {
+		m_newPalette(ox::FileAddress(ox::sfmt<ox::IString<43>>("uuid://{}", newPalette))) {
 }
 
 void PaletteChangeCommand::redo() noexcept {
diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp
index 306379d2..134057c4 100644
--- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp
+++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp
@@ -64,6 +64,7 @@ static ox::Error toPngFile(
 	for (auto &c : pixels) {
 		c = color32(color(pal, page, c)) | static_cast<Color32>(0XFF << 24);
 	}
+	std::hash<std::string>();
 	constexpr auto fmt = LCT_RGBA;
 	return OxError(static_cast<ox::ErrorCode>(
 			lodepng_encode_file(
@@ -440,7 +441,7 @@ void TileSheetEditorImGui::drawPaletteSelector() noexcept {
 				ImGui::PushID(static_cast<int>(i));
 				// Column: color idx
 				ImGui::TableNextColumn();
-				auto const label = ox::BString<8>() + (i + 1);
+				auto const label = ox::IString<8>() + (i + 1);
 				auto const rowSelected = i == m_view.palIdx();
 				if (ImGui::Selectable(label.c_str(), rowSelected, ImGuiSelectableFlags_SpanAllColumns)) {
 					m_view.setPalIdx(i);
diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp
index 6a545873..dc9b2c03 100644
--- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp
+++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp
@@ -28,7 +28,7 @@ class TileSheetEditorImGui: public studio::Editor {
 	private:
 		class SubSheetEditor {
 			private:
-				ox::BString<100> m_name;
+				ox::IString<100> m_name;
 				int m_cols = 0;
 				int m_rows = 0;
 				bool m_show = false;
diff --git a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp
index ec542fb9..534d5843 100644
--- a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp
+++ b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp
@@ -10,7 +10,7 @@
 
 namespace nostalgia::scene {
 
-class SceneModule: public keel::Module {
+static class: public keel::Module {
 	private:
 		SceneDocToSceneStaticConverter m_sceneDocToSceneStaticConverter;
 
@@ -42,9 +42,8 @@ class SceneModule: public keel::Module {
 			};
 		}
 
-};
+} mod;
 
-static const SceneModule mod;
 const keel::Module *keelModule() noexcept {
 	return &mod;
 }
diff --git a/src/olympic/studio/applib/src/newmenu.hpp b/src/olympic/studio/applib/src/newmenu.hpp
index 2852ddc9..658e72eb 100644
--- a/src/olympic/studio/applib/src/newmenu.hpp
+++ b/src/olympic/studio/applib/src/newmenu.hpp
@@ -28,7 +28,7 @@ class NewMenu: public studio::Popup {
 	private:
 		Stage m_stage = Stage::Closed;
 		ox::String m_typeName;
-		ox::BString<255> m_itemName;
+		ox::IString<255> m_itemName;
 		ox::Vector<ox::UniquePtr<studio::ItemMaker>> m_types;
 		int m_selectedType = 0;
 		bool m_open = false;
diff --git a/src/olympic/studio/applib/src/newproject.hpp b/src/olympic/studio/applib/src/newproject.hpp
index 6aad38e0..eae284d6 100644
--- a/src/olympic/studio/applib/src/newproject.hpp
+++ b/src/olympic/studio/applib/src/newproject.hpp
@@ -28,7 +28,7 @@ class NewProject: public studio::Popup {
 		Stage m_stage = Stage::Closed;
 		ox::String const m_projectDataDir;
 		ox::String m_projectPath;
-		ox::BString<255> m_projectName;
+		ox::IString<255> m_projectName;
 		ox::Vector<ox::UniquePtr<studio::ItemMaker>> m_types;
 		bool m_open = false;