diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index 0054da87e..fbf1ea5fd 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -65,7 +65,7 @@ void BootCommands_ParseBootArgs(s32 argc, char** argv)
     for (i = 0; i < argc; i++)
         DebugArena_Free(argv[i]);
 
-    DebugArena_Free(argv);
+    //DebugArena_Free(argv);
 }
 
 /*
diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp
index 6c4d3c16e..33ee3eb04 100644
--- a/soh/soh/Enhancements/savestates.cpp
+++ b/soh/soh/Enhancements/savestates.cpp
@@ -914,8 +914,8 @@ void SaveState::Save(void) {
     memcpy(&info->saveContextCopy, &gSaveContext, sizeof(gSaveContext));
     memcpy(&info->gameInfoCopy, gGameInfo, sizeof(*gGameInfo));
     memcpy(&info->lightBufferCopy, &sLightsBuffer, sizeof(sLightsBuffer));
-    memcpy(&info->mtxStackCopy, &sMatrixStack, sizeof(MtxF) * 20);
-    memcpy(&info->currentMtxCopy, &sCurrentMatrix, sizeof(MtxF));
+    memcpy(&info->mtxStackCopy, sMatrixStack, sizeof(MtxF) * 20);
+    memcpy(&info->currentMtxCopy, sCurrentMatrix, sizeof(MtxF));
 
     //Various static data
     info->blueWarpTimerCopy = sWarpTimerTarget;
@@ -938,8 +938,8 @@ void SaveState::Load(void) {
     memcpy(&gSaveContext, &info->saveContextCopy, sizeof(gSaveContext));
     memcpy(gGameInfo, &info->gameInfoCopy, sizeof(*gGameInfo));
     memcpy(&sLightsBuffer, &info->lightBufferCopy, sizeof(sLightsBuffer));
-    memcpy(&sMatrixStack, &info->mtxStackCopy, sizeof(MtxF) * 20);
-    memcpy(&sCurrentMatrix, &info->currentMtxCopy, sizeof(MtxF));
+    memcpy(sMatrixStack, &info->mtxStackCopy, sizeof(MtxF) * 20);
+    memcpy(sCurrentMatrix, &info->currentMtxCopy, sizeof(MtxF));
     sWarpTimerTarget = info->blueWarpTimerCopy;
 
     memcpy(gActiveSounds, info->gActiveSoundsCopy, sizeof(gActiveSounds));
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c
index 107e8f015..8c15fcd0f 100644
--- a/soh/src/code/audio_load.c
+++ b/soh/src/code/audio_load.c
@@ -773,7 +773,7 @@ uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
         {
             table = AudioLoad_GetLoadTable(tableType);
             size = table->entries[realId].size;
-            size = ALIGN16(size);
+            //size = ALIGN16(size);
             medium = table->entries[id].medium;
             cachePolicy = table->entries[id].cachePolicy;
             romAddr = table->entries[realId].romAddr;
@@ -1031,7 +1031,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
 void AudioLoad_SyncDma(uintptr_t devAddr, u8* addr, size_t size, s32 medium) {
     OSMesgQueue* msgQueue = &gAudioContext.syncDmaQueue;
     OSIoMesg* ioMesg = &gAudioContext.syncDmaIoMesg;
-    size = ALIGN16(size);
+    //size = ALIGN16(size);
 
     Audio_InvalDCache(addr, size);