diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
index 8bb437767f..fc85340906 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
@@ -15,8 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <float.h>
-
 #include "../../HW/Memmap.h"
 #include "../../HW/CPU.h"
 #include "../PPCTables.h"
@@ -98,11 +96,6 @@ void SingleStepInner(void)
 	NPC = PC + sizeof(UGeckoInstruction);
 	instCode.hex = Memory::ReadFast32(PC);  //  Memory::ReadUnchecked_U32(PC);
 
-    //Memory::Read_Instruction(PC);	// use the memory functions to read from the memory !!!!!!
-	//if (PowerPC::ppcState.DebugCount > 0x10f233a) { // 50721ef253a
-	//	printf("> %08x - %08x - %s\n", PC, instCode.hex, DisassembleGekko(instCode.hex, PC));
-	//}
-
 	UReg_MSR& msr = (UReg_MSR&)MSR;
 	if (msr.FP)  //If FPU is enabled, just execute
 		m_opTable[instCode.OPCD](instCode);
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
index d96b00b474..ae68153fe4 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
@@ -438,7 +438,7 @@ void addex(UGeckoInstruction _inst)
 	int a = m_GPR[_inst.RA];
 	int b = m_GPR[_inst.RB];
 	m_GPR[_inst.RD] = a + b + carry;
-	SetCarry(Helper_Carry(a,b) || (carry != 0 && Helper_Carry(a + b, carry)));
+	SetCarry(Helper_Carry(a, b) || (carry != 0 && Helper_Carry(a + b, carry)));
 
 	if (_inst.OE) PanicAlert("OE: addex");
 	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
@@ -449,7 +449,7 @@ void addmex(UGeckoInstruction _inst)
 	int carry = GetCarry();
 	int a = m_GPR[_inst.RA];
 	m_GPR[_inst.RD] = a + carry - 1;
-	SetCarry(Helper_Carry(a, carry-1));
+	SetCarry(Helper_Carry(a, carry - 1));
 
 	if (_inst.OE) PanicAlert("OE: addmex");
 	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
@@ -505,7 +505,7 @@ void mulhwx(UGeckoInstruction _inst)
 {
 	u32 a = m_GPR[_inst.RA];
 	u32 b = m_GPR[_inst.RB];
-	u32 d = (u32)((u64)(((s64)(s32)a * (s64)(s32)b) ) >> 32); //wheeee
+	u32 d = (u32)((u64)(((s64)(s32)a * (s64)(s32)b) ) >> 32);  // This can be done better. Not in plain C/C++ though.
 	m_GPR[_inst.RD] = d;
 	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
 }
diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
index 8207fcaa8e..57e5b2be0e 100644
--- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp
+++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
@@ -15,9 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#ifdef _WIN32
 #include <float.h>
-#endif
 
 #include "Common.h"
 #include "ChunkFile.h"
diff --git a/Source/Core/DolphinWX/src/Main.cpp b/Source/Core/DolphinWX/src/Main.cpp
index 17ee8d3b84..25bce4fd6c 100644
--- a/Source/Core/DolphinWX/src/Main.cpp
+++ b/Source/Core/DolphinWX/src/Main.cpp
@@ -45,26 +45,21 @@ bool DolphinApp::OnInit()
 
 #ifdef _WIN32
 	// TODO: if First Boot
-	/*
 	if (!cpu_info.bSSE2) 
 	{
 		MessageBox(0, _T("Hi,\n\nDolphin requires that your CPU has support for SSE2 extensions.\n"
 			             "Unfortunately your CPU does not support them, so Dolphin will not run.\n\n"
 						 "Sayonara!\n"), "Dolphin", MB_ICONINFORMATION);
 		return false;
-	}*/
-	/*
-#ifdef _M_IX86
-	if (cpu_info.CPU64bit && cpu_info.OS64bit)
-	{
-		MessageBox(0, _T("This is the 32-bit version of Dolphin. This computer is running a 64-bit OS.\n"
-				 "Thus, this computer is capable of running Dolphin 64-bit, which is considerably "
-				 "faster than Dolphin 32-bit. So, why are you running Dolphin 32-bit? :-)"), "Dolphin", MB_ICONINFORMATION);
 	}
-
-	// missing check
-#endif
-	*/
+#else
+	if (!cpu_info.bSSE2)
+	{
+		printf("%s", "Hi,\n\nDolphin requires that your CPU has support for SSE2 extensions.\n"
+               "Unfortunately your CPU does not support them, so Dolphin will not run.\n\n"
+    		   "Sayonara!\n");
+		exit(0);
+	}
 #endif
 
 	bool UseDebugger = false;