diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index e287120bce..3e6edb7e3e 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -809,7 +809,7 @@ void Callback_KeyPress(int key, bool shift, bool control)
 	if (key == 0x7a)
 		State_LoadLastSaved();
 
-	// 0x7a == VK_F12
+	// 0x7b == VK_F12
 	if (key == 0x7b) 
 	{
 		if(shift)
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index 7b020c94fb..fd4f966e7f 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -44,7 +44,6 @@ void SCoreStartupParameter::LoadDefaults()
 	bDSPThread = true;
 	bLockThreads = true;
 	bEnableFPRF = false;
-	bAccurateFCMP = false;
 	bWii = false;
 	SelectedLanguage = 0;
 	iTLBHack = 0;
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 736514fa56..02585c1b8a 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -58,7 +58,6 @@ struct SCoreStartupParameter
 	bool bJITProfiledReJIT;
 
 	bool bEnableFPRF;
-	bool bAccurateFCMP;
 
 	bool bUseDualCore;
 	bool bDSPThread;
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
index 1a932ce308..15b1820a27 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -210,7 +210,7 @@ void Jit64::Init()
 	jo.enableFastMem = false;
 #endif
 	jo.assumeFPLoadFromMem = true;
-	jo.fpAccurateFcmp = Core::GetStartupParameter().bEnableFPRF || Core::GetStartupParameter().bAccurateFCMP;
+	jo.fpAccurateFcmp = true; // Fallback to Interpreter
 	jo.optimizeGatherPipe = true;
 	jo.fastInterrupts = false;
 	jo.accurateSinglePrecision = true;
@@ -466,7 +466,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitB
 
 	if (ImHereDebug)
 		ABI_CallFunction((void *)&ImHere); //Used to get a trace of the last few blocks before a crash, sometimes VERY useful
-	
+
 	if (js.fpa.any)
 	{
 		//This block uses FPU - needs to add FP exception bailout
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
index 8b00e7165a..a6ad81afa6 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -208,7 +208,8 @@ void Jit64::fmrx(UGeckoInstruction inst)
  
 void Jit64::fcmpx(UGeckoInstruction inst)
 {
-	// TODO : this causes crashes in Nights, and broken graphics in Paper Mario, Super Paper Mario
+	// TODO : This still causes crashes in Nights, and broken graphics
+	// in Paper Mario, Super Paper Mario as well as SoulCalibur 2 prolly others too.. :(
 	INSTRUCTION_START;
 	if(Core::g_CoreStartupParameter.bJITOff || jo.fpAccurateFcmp
 	|| Core::g_CoreStartupParameter.bJITFloatingPointOff) {
diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp
index 86dcf0e04a..5e98123b07 100644
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@@ -132,7 +132,6 @@ bool BootCore(const std::string& _rFilename)
 		ini->Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
 		ini->Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
 		ini->Get("Core", "EnableFPRF", &StartUp.bEnableFPRF, StartUp.bEnableFPRF);
-		ini->Get("Core", "AccurateFCMP", &StartUp.bAccurateFCMP, StartUp.bAccurateFCMP);
 		ini->Get("Core", "TLBHack", &StartUp.iTLBHack, StartUp.iTLBHack);
 
 		// ------------------------------------------------
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp
index df841a5077..2fae11ca3c 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp
@@ -333,7 +333,8 @@ void CUCode_Zelda::HandleMail_NormalVersion(u32 _uMail)
 
 				if (m_CurBuffer == m_NumBuffers)
 				{
-					m_rMailHandler.PushMail(DSP_FRAME_END);
+					if (!IsDMAVersion())
+						m_rMailHandler.PushMail(DSP_FRAME_END);
 					//g_dspInitialize.pGenerateDSPInterrupt();
 
 					soundStream->GetMixer()->SetHLEReady(true);
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h
index 2fc0fecb4d..6cbd3c94a2 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h
@@ -186,7 +186,7 @@ private:
 		{
 			case 0xb7eb9a9c: // Wii Pikmin - PAL
 			case 0xeaeb38cc: // Wii Pikmin 2 - PAL
-			case 0x6c3f6f94: // zelda - PAL
+			case 0x6c3f6f94: // Wii Zelda TP - PAL
 			case 0xD643001F: // Super Mario Galaxy
 				return true;
 			default: