diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.png b/Source/Core/DolphinWX/resources/Flag_Europe.png
new file mode 100644
index 0000000000..c41352f36a
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Flag_Europe.png differ
diff --git a/Source/Core/DolphinWX/resources/Flag_France.png b/Source/Core/DolphinWX/resources/Flag_France.png
new file mode 100644
index 0000000000..3390ee79c2
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Flag_France.png differ
diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.png b/Source/Core/DolphinWX/resources/Flag_Italy.png
new file mode 100644
index 0000000000..aa0ea79d31
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Flag_Italy.png differ
diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.png b/Source/Core/DolphinWX/resources/Flag_Japan.png
new file mode 100644
index 0000000000..183275cd85
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Flag_Japan.png differ
diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.png b/Source/Core/DolphinWX/resources/Flag_Taiwan.png
new file mode 100644
index 0000000000..c71920f92c
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Flag_Taiwan.png differ
diff --git a/Source/Core/DolphinWX/resources/Flag_USA.png b/Source/Core/DolphinWX/resources/Flag_USA.png
new file mode 100644
index 0000000000..2803a73a3d
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Flag_USA.png differ
diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.png b/Source/Core/DolphinWX/resources/Flag_Unknown.png
new file mode 100644
index 0000000000..44cd41bafb
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Flag_Unknown.png differ
diff --git a/Source/Core/DolphinWX/resources/Platform_Gamecube.png b/Source/Core/DolphinWX/resources/Platform_Gamecube.png
new file mode 100644
index 0000000000..0566ab22e1
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Platform_Gamecube.png differ
diff --git a/Source/Core/DolphinWX/resources/Platform_Wad.png b/Source/Core/DolphinWX/resources/Platform_Wad.png
new file mode 100644
index 0000000000..80cdf7176a
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Platform_Wad.png differ
diff --git a/Source/Core/DolphinWX/resources/Platform_Wii.png b/Source/Core/DolphinWX/resources/Platform_Wii.png
new file mode 100644
index 0000000000..b0c9b45d6f
Binary files /dev/null and b/Source/Core/DolphinWX/resources/Platform_Wii.png differ
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_Synth.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_Synth.cpp
index a1f2024029..00c807acfb 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_Synth.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_Synth.cpp
@@ -170,10 +170,10 @@ void CUCode_Zelda::RenderSynth_WaveTable(ZeldaVoicePB &PB, s32* _Buffer, int _Si
 
 	u64 ACC0 = PB.CurSampleFrac << 6;
 
-	ACC0 &= 0xffff003fffff;
+	ACC0 &= 0xffff003fffffULL;
 
 	address = AddValueToReg(address, ((ACC0 >> 16) & 0xffff));
-	ACC0 &= 0xffff0000ffff;
+	ACC0 &= 0xffff0000ffffULL;
 
 	for(int i = 0; i < _Size; i++) 
 	{
@@ -182,7 +182,7 @@ void CUCode_Zelda::RenderSynth_WaveTable(ZeldaVoicePB &PB, s32* _Buffer, int _Si
 		ACC0 += PB.RatioInt << 5;
 		address = AddValueToReg(address, ((ACC0 >> 16) & 0xffff));
 
-		ACC0 &= 0xffff0000ffff;
+		ACC0 &= 0xffff0000ffffULL;
 	}
 
 	ACC0 = address << 16;