diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp
index 95b8e3a970..daf69c1a09 100644
--- a/Source/Core/Core/Src/HW/DVDInterface.cpp
+++ b/Source/Core/Core/Src/HW/DVDInterface.cpp
@@ -715,7 +715,7 @@ void ExecuteCommand(UDICR& _DICR)
 			else*/
 			if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40)
 			{
-				unsigned long addr = m_DIMAR.Address;
+				u32 addr = m_DIMAR.Address;
 				if (iDVDOffset == 0x84800000) {
 					ERROR_LOG(DVDINTERFACE, "FIRMWARE UPLOAD");
 				} else {
@@ -731,7 +731,7 @@ void ExecuteCommand(UDICR& _DICR)
 			}
 			else
 			{
-				unsigned long addr = m_DIMAR.Address;
+				u32 addr = m_DIMAR.Address;
 				memcpy(media_buffer + offset, Memory::GetPointer(addr), len);
 				while (len >= 4)
 				{
@@ -769,7 +769,8 @@ void ExecuteCommand(UDICR& _DICR)
 				break;
 			case 0x100:
 				{
-					static int percentage;
+					// urgh
+					static int percentage = 0;
 					static int status = 0;
 					percentage++;
 					if (percentage > 100)
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_ADPCM.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_ADPCM.cpp
index c728ab4cb2..f33713f581 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_ADPCM.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_ADPCM.cpp
@@ -67,7 +67,7 @@ void CUCode_Zelda::AFCdecodebuffer(const s16 *coef, const char *src, signed shor
     short hist2 = *hist2p;
     for (int i = 0; i < 16; i++)
 	{
-        int sample = delta * nibbles[i] + ((long)hist * coef[idx * 2]) + ((long)hist2 * coef[idx * 2 + 1]);
+        int sample = delta * nibbles[i] + ((int)hist * coef[idx * 2]) + ((int)hist2 * coef[idx * 2 + 1]);
 	    if (type == 9)
 		    sample >>= 11;
 		else