diff --git a/desmume/src/mc.cpp b/desmume/src/mc.cpp
index a87430f2b..b95685fb3 100644
--- a/desmume/src/mc.cpp
+++ b/desmume/src/mc.cpp
@@ -596,6 +596,7 @@ void BackupDevice::reset_command()
 		u32 autodetect_size = data_autodetect.size();
 		addr_size = autodetect_size - 1;
 		if(autodetect_size==6) addr_size = 2; //castlevania dawn of sorrow 64kbit eeprom (EEPROM2 in the old system)
+		if(autodetect_size==258) addr_size = 2; //warioware touched
 		if(addr_size>4)
 		{
 			LOG("Unexpected backup memory address size: %d\n",addr_size);
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index edb309a55..bf3f8dd73 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -206,8 +206,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release FastBuild|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)\__bins"
+			IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			WholeProgramOptimization="0"
@@ -267,7 +267,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib  winpcap\wpcap.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_release.exe"
+				OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"