diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index ce6412a528..00d0b9d185 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -52,14 +52,14 @@ SCoreStartupParameter::SCoreStartupParameter()
   bRunCompareServer(false), bRunCompareClient(false),
   bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false),
   bFastDiscSpeed(false),
-  SelectedLanguage(0), bWii(false),
+  SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false),
   bConfirmStop(false), bHideCursor(false), 
   bAutoHideCursor(false), bUsePanicHandlers(true),
   iRenderWindowXPos(-1), iRenderWindowYPos(-1),
   iRenderWindowWidth(640), iRenderWindowHeight(480),
   bRenderWindowAutoSize(false),
   bFullscreen(false), bRenderToMain(false),
-  bProgressive(false), bDisableWiimoteSpeaker(false),
+  bProgressive(false),
   iTheme(0),
   iPosX(100), iPosY(100), iWidth(800), iHeight(600)
 {
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
index 8c87b29e9d..107a29a9d1 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
@@ -512,7 +512,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
 
 		//now restore from the stream
 		while(1) {
-			char type;
+			char type = 0;
 			p.Do(type);
 			if (!type)
 				break;
@@ -528,7 +528,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
 			}
 			case 'f':
 			{
-				u32 size;
+				u32 size = 0;
 				p.Do(size);
 
 				File::IOFile handle(name, "wb");
diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
index 827e4cbe2d..c3ed12bbea 100644
--- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
+++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
@@ -120,7 +120,7 @@ void CARCodeAddEdit::SaveCheatData(wxCommandEvent& WXUNUSED (event))
 		}
 
 		// If the above-mentioned conditions weren't met, then something went wrong.
-		if (!PanicYesNoT("Unable to parse line %u of the entered AR code as a valid "
+		if (!PanicYesNoT("Unable to parse line %lu of the entered AR code as a valid "
 						"encrypted or decrypted code.  Make sure you typed it correctly.\n"
 						"Would you like to ignore this line and continue parsing?",  i + 1))
 		{
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
index deaa618e92..fcfcb469bb 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
@@ -3,11 +3,14 @@
 #include "FileUtil.h"
 #include "TextureCacheBase.h"
 #include "Core.h"
+#include "Frame.h"
 
 #include <wx/intl.h>
 
 #define _connect_macro_(b, f, c, s)	(b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
 
+extern CFrame* main_frame;
+
 // template instantiation
 template class BoolSetting<wxCheckBox>;
 template class BoolSetting<wxRadioButton>;
@@ -600,6 +603,16 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	UpdateWindowUI();
 }
 
+void VideoConfigDiag::Event_DisplayResolution(wxCommandEvent &ev)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
+		choice_display_resolution->GetStringSelection().mb_str();
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+	main_frame->m_XRRConfig->Update();
+#endif
+	ev.Skip();
+}
+
 SettingCheckBox* VideoConfigDiag::CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style)
 {
 	SettingCheckBox* const cb = new SettingCheckBox(parent, label, wxString(), setting, reverse, style);
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h
index dfe5c0a3be..82a9322a70 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.h
@@ -20,9 +20,6 @@
 #include <wx/spinctrl.h>
 
 #include "MsgHandler.h"
-#include "Frame.h"
-
-extern CFrame* main_frame;
 
 template <typename W>
 class BoolSetting : public W
@@ -109,15 +106,7 @@ protected:
 	}
 	void Event_Adapter(wxCommandEvent &ev) { ev.Skip(); } // TODO
 
-	void Event_DisplayResolution(wxCommandEvent &ev)
-	{
-		SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
-					choice_display_resolution->GetStringSelection().mb_str();
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-		main_frame->m_XRRConfig->Update();
-#endif
-		ev.Skip();
-	}
+	void Event_DisplayResolution(wxCommandEvent &ev);
 
 	void Event_ProgressiveScan(wxCommandEvent &ev)
 	{