diff --git a/OTRExporter/CMakeLists.txt b/OTRExporter/CMakeLists.txt
index 723ad04..2082ba9 100644
--- a/OTRExporter/CMakeLists.txt
+++ b/OTRExporter/CMakeLists.txt
@@ -174,7 +174,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/spdlog/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/nlohmann-json/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../soh/soh
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../mm/2s2h
 	.
 )
 
diff --git a/OTRExporter/CutsceneExporter.cpp b/OTRExporter/CutsceneExporter.cpp
index 048ffab..d6d2c05 100644
--- a/OTRExporter/CutsceneExporter.cpp
+++ b/OTRExporter/CutsceneExporter.cpp
@@ -450,8 +450,8 @@ void OTRExporter_Cutscene::SaveOot(ZCutscene* cs, BinaryWriter* writer) {
 }
 // MUST be uint16_t for -1
 typedef enum : uint16_t{
-    /* -1 */ CS_TEXT_TYPE_NONE = -1,
-    /*  0 */ CS_TEXT_TYPE_DEFAULT,
+    /* -1 */ CS_TEXT_TYPE_NONE = (uint16_t)-1,
+    /*  0 */ CS_TEXT_TYPE_DEFAULT = 0,
     /*  1 */ CS_TEXT_TYPE_1,
     /*  2 */ CS_TEXT_OCARINA_ACTION,
     /*  3 */ CS_TEXT_TYPE_3,
diff --git a/OTRExporter/RoomExporter.cpp b/OTRExporter/RoomExporter.cpp
index 2818cbf..047fa9a 100644
--- a/OTRExporter/RoomExporter.cpp
+++ b/OTRExporter/RoomExporter.cpp
@@ -172,7 +172,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			for (const auto& c : cmdCsCam->cameras) {
 				writer->Write(c.type);
 				writer->Write(c.numPoints);
-				for (size_t i = 0; i < c.numPoints; i++) {
+				for (int16_t i = 0; i < c.numPoints; i++) {
 					writer->Write(cmdCsCam->points[((c.baseOffset - arrBase) / 6) + i].scalars[0].scalarData.s16);
 					writer->Write(cmdCsCam->points[((c.baseOffset - arrBase) / 6) + i].scalars[1].scalarData.s16);
 					writer->Write(cmdCsCam->points[((c.baseOffset - arrBase) / 6) + i].scalars[2].scalarData.s16);
diff --git a/OTRExporter/TextureAnimationExporter.h b/OTRExporter/TextureAnimationExporter.h
index 40b1983..1ac12d3 100644
--- a/OTRExporter/TextureAnimationExporter.h
+++ b/OTRExporter/TextureAnimationExporter.h
@@ -3,7 +3,7 @@
 #include "ZResource.h"
 #include "ZTextureAnimation.h"
 #include "Exporter.h"
-#include <utils/BinaryWriter.h>
+#include <Utils/BinaryWriter.h>
 
 class OTRExporter_TextureAnimation : public OTRExporter
 {
diff --git a/OTRExporter/command_macros_base.h b/OTRExporter/command_macros_base.h
index 3067d2c..1506c78 100644
--- a/OTRExporter/command_macros_base.h
+++ b/OTRExporter/command_macros_base.h
@@ -25,11 +25,7 @@
 
 #define CMD_W(a) (a)
 
-#if defined(__GNUC__)
-#define CMD_F(a) {.f = (a)}
-#else
 #define CMD_F(a) {(a)}
-#endif
 
 #define CMD_PTR(a) (u32)(a)