diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index 328dbb5d..3c007224 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -2984,6 +2984,7 @@ nw4r/snd/snd_NandSoundArchive.cpp:
 
 nw4r/snd/snd_PlayerHeap.cpp:
 	.text       start:0x804700C0 end:0x804702DC align:16
+	.data       start:0x8056DFF0 end:0x8056E000
 
 nw4r/snd/snd_RemoteSpeaker.cpp:
 	.text       start:0x804702E0 end:0x80470C90 align:16
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index c08478ef..efdbde41 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -38602,7 +38602,7 @@ lbl_8056DF48 = .data:0x8056DF48; // type:object size:0x10
 lbl_8056DF58 = .data:0x8056DF58; // type:object size:0x18
 lbl_8056DF70 = .data:0x8056DF70; // type:object size:0x60
 lbl_8056DFD0 = .data:0x8056DFD0; // type:object size:0x20
-lbl_8056DFF0 = .data:0x8056DFF0; // type:object size:0x10
+__vt__Q44nw4r3snd6detail10PlayerHeap = .data:0x8056DFF0; // type:object size:0x10
 lbl_8056E000 = .data:0x8056E000; // type:object size:0xC data:4byte
 lbl_8056E00C = .data:0x8056E00C; // type:object size:0xC data:4byte
 lbl_8056E018 = .data:0x8056E018; // type:object size:0xC data:4byte
diff --git a/configure.py b/configure.py
index 90819320..3e6bd835 100644
--- a/configure.py
+++ b/configure.py
@@ -1044,7 +1044,7 @@ config.libs = [
             Object(NonMatching, "nw4r/snd/snd_MmlSeqTrack.cpp"),
             Object(NonMatching, "nw4r/snd/snd_MmlSeqTrackAllocator.cpp"),
             Object(NonMatching, "nw4r/snd/snd_NandSoundArchive.cpp"),
-            Object(NonMatching, "nw4r/snd/snd_PlayerHeap.cpp"),
+            Object(Matching, "nw4r/snd/snd_PlayerHeap.cpp"),
             Object(NonMatching, "nw4r/snd/snd_RemoteSpeaker.cpp"),
             Object(NonMatching, "nw4r/snd/snd_RemoteSpeakerManager.cpp"),
             Object(NonMatching, "nw4r/snd/snd_SeqFile.cpp"),
diff --git a/src/nw4r/snd/snd_MmlParser.cpp b/src/nw4r/snd/snd_MmlParser.cpp
index d481920f..56fe73b2 100644
--- a/src/nw4r/snd/snd_MmlParser.cpp
+++ b/src/nw4r/snd/snd_MmlParser.cpp
@@ -159,7 +159,7 @@ MmlSeqTrack::ParseResult MmlParser::Parse(MmlSeqTrack *track,
 		s32 commandArg1 = 0;
 		s32 commandArg2 = 0;
 
-		switch (static_cast<int>(cmd & MML_CMD_SET_MASK))
+		switch (cmd & MML_CMD_SET_MASK)
 		{
 		case 0x80:
 		{
diff --git a/src/nw4r/snd/snd_NandSoundArchive.cpp b/src/nw4r/snd/snd_NandSoundArchive.cpp
index e37db9d9..2e104f72 100644
--- a/src/nw4r/snd/snd_NandSoundArchive.cpp
+++ b/src/nw4r/snd/snd_NandSoundArchive.cpp
@@ -193,9 +193,6 @@ NandSoundArchive::NandFileStream::NandFileStream(const NANDFileInfo* pFileInfo,
       mSize(size) {
 
     if (IsAvailable()) {
-        if (mSize == 0) {
-            mSize = ut::NandFileStream::GetSize();
-        }
 
         ut::NandFileStream::Seek(mOffset, SEEKORG_BEG);
     }
@@ -208,9 +205,6 @@ NandSoundArchive::NandFileStream::NandFileStream(const char* pPath, u32 offset,
       mSize(size) {
 
     if (IsAvailable()) {
-        if (mSize == 0) {
-            mSize = ut::NandFileStream::GetSize();
-        }
 
         ut::NandFileStream::Seek(mOffset, SEEKORG_BEG);
     }