diff --git a/Frameworks/GME/gme/Vgm_Emu.cpp b/Frameworks/GME/gme/Vgm_Emu.cpp
index e4217e7a9..975401f4f 100644
--- a/Frameworks/GME/gme/Vgm_Emu.cpp
+++ b/Frameworks/GME/gme/Vgm_Emu.cpp
@@ -155,6 +155,7 @@ static void get_vgm_length( Vgm_Emu::header_t const& h, track_info_t* out )
 		int loop = h.lngLoopSamples;
 		if ( loop > 0 && h.lngLoopOffset )
 		{
+			out->length = 0;
 			out->loop_length  = loop * 10 / 441;
 			out->intro_length = length - out->loop_length;
 			check( out->loop_length <= length );
diff --git a/Frameworks/GME/vgmplay/VGMPlay.c b/Frameworks/GME/vgmplay/VGMPlay.c
index cd8ad91ae..e0b4c2d17 100644
--- a/Frameworks/GME/vgmplay/VGMPlay.c
+++ b/Frameworks/GME/vgmplay/VGMPlay.c
@@ -1479,7 +1479,6 @@ const char* GetChipName(UINT8 ChipID)
 const char* GetAccurateChipName(UINT8 ChipID, UINT8 SubType)
 {
 	const char* RetStr;
-	static char TempStr[0x10];
 
 	if ((ChipID & 0x7F) >= CHIP_COUNT)
 		return NULL;