diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index a80ef04198..9532a06f45 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Common"
 	ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
 	RootNamespace="Common"
@@ -267,7 +267,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../PluginSpecs"
+				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/Source/Core/Common/Src/Common.cpp b/Source/Core/Common/Src/Common.cpp
index 29982f3748..95136fe577 100644
--- a/Source/Core/Common/Src/Common.cpp
+++ b/Source/Core/Common/Src/Common.cpp
@@ -19,6 +19,7 @@
 
 #include "Common.h"
 #include "StringUtil.h"
+#include <wx/msgdlg.h>
 
 namespace
 {
@@ -45,17 +46,10 @@ void PanicAlert(const char* format, ...)
 	}
 	else
 	{
-#ifdef _WIN32
 		char buffer[2048];
 		CharArrayFromFormatV(buffer, 2048, format, args);
 		LOG(MASTER_LOG, "PANIC: %s", buffer);
-		MessageBox(0, buffer, "PANIC!", MB_ICONWARNING);
-#elif __GNUC__
-		//#error Do a messagebox!
-		vprintf(format, args);
-		printf("\n");
-//        asm ("int $3") ;
-#endif
+		wxMessageBox(buffer, "PANIC!", wxICON_EXCLAMATION);
 	}
 
 	va_end(args);
@@ -67,16 +61,10 @@ bool PanicYesNo(const char* format, ...)
 	va_list args;
 	va_start(args, format);
 	bool retval;
-#ifdef _WIN32
 	char buffer[2048];
 	CharArrayFromFormatV(buffer, 2048, format, args);
 	LOG(MASTER_LOG, "PANIC: %s", buffer);
-	retval = IDYES == MessageBox(0, buffer, "PANIC! Continue?", MB_ICONQUESTION | MB_YESNO);
-#elif __GNUC__
-	//vprintf(format, args);
-	return(true); //#error Do a messagebox!
-#endif
-
+	retval = wxYES == wxMessageBox(buffer, "PANIC! Continue?", wxICON_QUESTION | wxYES_NO);
 	va_end(args);
 	return(retval);
 }
@@ -87,16 +75,10 @@ bool AskYesNo(const char* format, ...)
 	va_list args;
 	va_start(args, format);
 	bool retval;
-#ifdef _WIN32
 	char buffer[2048];
 	CharArrayFromFormatV(buffer, 2048, format, args);
 	LOG(MASTER_LOG, "ASK: %s", buffer);
-	retval = IDYES == MessageBox(0, buffer, "Dolphin", MB_ICONQUESTION | MB_YESNO);
-#elif __GNUC__
-	//vprintf(format, args);
-	return(true); //#error Do a messagebox!
-#endif
-
+	retval = wxYES == wxMessageBox(buffer, "Dolphin", wxICON_QUESTION | wxYES_NO);
 	va_end(args);
 	return(retval);
 }
diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp
index 23cfa84ef4..936fdd6656 100644
--- a/Source/Core/Core/Src/ActionReplay.cpp
+++ b/Source/Core/Core/Src/ActionReplay.cpp
@@ -593,15 +593,15 @@ bool ZeroCode_FillAndSlide(u32 val_last, u32 addr, u32 data) // This needs more
 					LogInfo("Write %08x to address %08x", val & 0xFF, curr_addr);
 					if (val_incr < 0)
 					{
-						val -= (u32)val_incr;
+						val -= (u32)abs(val_incr);
 					}
 					if (val_incr > 0)
 					{
-						val += (u32)(abs(val_incr));
+						val += (u32)val_incr;
 					}
 					if (addr_incr < 0)
 					{
-						curr_addr -= (u32)(abs(addr_incr));
+						curr_addr -= (u32)abs(addr_incr);
 					}
 					if (addr_incr > 0)
 					{
@@ -620,15 +620,15 @@ bool ZeroCode_FillAndSlide(u32 val_last, u32 addr, u32 data) // This needs more
 					LogInfo("Write %08x to address %08x", val & 0xFFFF, curr_addr);
 					if (val_incr < 0)
 					{
-						val -= (u32)val_incr;
+						val -= (u32)abs(val_incr);
 					}
 					if (val_incr > 0)
 					{
-						val += (u32)(abs(val_incr));
+						val += (u32)val_incr;
 					}
 					if (addr_incr < 0)
 					{
-						curr_addr -= (u32)(abs(addr_incr));
+						curr_addr -= (u32)abs(addr_incr);
 					}
 					if (addr_incr > 0)
 					{
@@ -647,15 +647,15 @@ bool ZeroCode_FillAndSlide(u32 val_last, u32 addr, u32 data) // This needs more
 					LogInfo("Write %08x to address %08x", val, curr_addr);
 					if (val_incr < 0)
 					{
-						val -= (u32)val_incr;
+						val -= (u32)abs(val_incr);
 					}
 					if (val_incr > 0)
 					{
-						val += (u32)(abs(val_incr));
+						val += (u32)val_incr;
 					}
 					if (addr_incr < 0)
 					{
-						curr_addr -= (u32)(abs(addr_incr));
+						curr_addr -= (u32)abs(addr_incr);
 					}
 					if (addr_incr > 0)
 					{
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index 5c009bdf16..683a623ad7 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="DolphinWX"
 	ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
 	RootNamespace="DolphinWX"