diff --git a/src/emucore/m6502/src/bspf/src/bspf.hxx b/src/emucore/m6502/src/bspf/src/bspf.hxx
index 6e2be7732..cdad73600 100644
--- a/src/emucore/m6502/src/bspf/src/bspf.hxx
+++ b/src/emucore/m6502/src/bspf/src/bspf.hxx
@@ -104,9 +104,9 @@
 
 // CPU architecture type
 // This isn't complete yet, but takes care of all the major platforms
-#if defined(__i386__)
+#if defined(__i386__) || defined(_M_IX86)
   #define BSPF_ARCH "i386"
-#elif defined(__x86_64__)
+#elif defined(__x86_64__) || defined(_WIN64)
   #define BSPF_ARCH "x86_64"
 #elif defined(__powerpc__) || defined(__ppc__)
   #define BSPF_ARCH "ppc"
diff --git a/src/win32/Stella.vcproj b/src/win32/Stella.vcproj
index dedbbd87a..1a446bce9 100755
--- a/src/win32/Stella.vcproj
+++ b/src/win32/Stella.vcproj
@@ -469,6 +469,10 @@
 					RelativePath="..\emucore\CartEFSC.cxx"
 					>
 				</File>
+				<File
+					RelativePath="..\emucore\CartF0.cxx"
+					>
+				</File>
 				<File
 					RelativePath="..\emucore\CartF4.cxx"
 					>
@@ -494,17 +498,13 @@
 					>
 				</File>
 				<File
-					RelativePath="..\emucore\CartFASC.cxx"
+					RelativePath="..\emucore\CartFA.cxx"
 					>
 				</File>
 				<File
 					RelativePath="..\emucore\CartFE.cxx"
 					>
 				</File>
-				<File
-					RelativePath="..\emucore\CartMB.cxx"
-					>
-				</File>
 				<File
 					RelativePath="..\emucore\CartMC.cxx"
 					>
@@ -1087,6 +1087,10 @@
 					RelativePath="..\emucore\CartEFSC.hxx"
 					>
 				</File>
+				<File
+					RelativePath="..\emucore\CartF0.hxx"
+					>
+				</File>
 				<File
 					RelativePath="..\emucore\CartF4.hxx"
 					>
@@ -1112,17 +1116,13 @@
 					>
 				</File>
 				<File
-					RelativePath="..\emucore\CartFASC.hxx"
+					RelativePath="..\emucore\CartFA.hxx"
 					>
 				</File>
 				<File
 					RelativePath="..\emucore\CartFE.hxx"
 					>
 				</File>
-				<File
-					RelativePath="..\emucore\CartMB.hxx"
-					>
-				</File>
 				<File
 					RelativePath="..\emucore\CartMC.hxx"
 					>