diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
index 4e8fe80829..474fac90ef 100644
--- a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
@@ -360,7 +360,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event){
 		//sprintf(tmpstr,"%s%s",tmpstr,rawData.c_str());
 		 //strcpy(&tmpstr[1],rawData.ToAscii());
 		//memcpy(&tmpstr[1],&rawData.c_str()[0],rawData.size());
-		sprintf(tmpstr,"%s%s",tmpstr,rawData.To8BitData());
+		sprintf(tmpstr,"%s%s",tmpstr,(const char *)rawData.mb_str());
           tmp2=&Dest.front();
 		  count=0;
 		  for(i=0;i<strlen(tmpstr);i++){
@@ -382,7 +382,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event){
 					
 					
 				tmp2=&Dest.front();
-				sprintf(tmpstr,"%s",rawData.To8BitData());
+				sprintf(tmpstr,"%s",(const char *)rawData.mb_str());
 				for(i=0;i<size;i++){
                   tmp2[i]=tmpstr[i];
 				}
@@ -442,4 +442,4 @@ void CMemoryWindow::onHex(wxCommandEvent& event){
 chkAscii->SetValue(0);
 
 
-}
\ No newline at end of file
+}
diff --git a/Source/Plugins/Plugin_Wiimote/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript
index 87c6fd9dfc..ec482e0df4 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/SConscript
+++ b/Source/Plugins/Plugin_Wiimote/Src/SConscript
@@ -10,21 +10,20 @@ files = [
         "Config.cpp",
         "DataReports.cpp",
         "EmuDefinitions.cpp",
-	"EmuDynamics.cpp",
+		"EmuDynamics.cpp",
         "EmuMain.cpp",
         "EmuPad.cpp",
         "EmuSubroutines.cpp",
         "Encryption.cpp",
-	"FakeAccelerometer.cpp",
         "main.cpp",
-	"Rumble.cpp",
+		"Rumble.cpp",
 	]
 if wmenv['HAVE_WX']:
     files += [
         "ConfigBasicDlg.cpp",
         "ConfigPadDlg.cpp",
         "ConfigRecordingDlg.cpp",
-	"ConfigGamepad.cpp",
+		"ConfigGamepad.cpp",
         "ConfigRecording.cpp",
         "FillReport.cpp",
         ]