diff --git a/SConstruct b/SConstruct
index cb90c2eaf66..e6dd85e8cff 100644
--- a/SConstruct
+++ b/SConstruct
@@ -124,7 +124,10 @@ if toolset:
 		#if env:
 		#	btools.SetupSpawn(env)
 else:
-	env = BlenderEnvironment(ENV = os.environ)
+	if bitness==64 and platform=='win32':
+		env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+	else:
+		env = BlenderEnvironment(ENV = os.environ)
 
 if not env:
 	print "Could not create a build environment"
diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index 429f8b0b6d6..53df6d96bf8 100644
--- a/config/win64-vc-config.py
+++ b/config/win64-vc-config.py
@@ -158,7 +158,7 @@ BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
 BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'opencollada'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 WITH_BF_STATICOPENGL = False
diff --git a/intern/moto/include/MT_assert.h b/intern/moto/include/MT_assert.h
index 22f6b6a555c..b8f18fc52ff 100644
--- a/intern/moto/include/MT_assert.h
+++ b/intern/moto/include/MT_assert.h
@@ -76,7 +76,7 @@ abort();
 #endif /* breakpoint */
 
 
-#if defined(WIN32) && !defined(__GNUC__)
+#if defined(_WIN32) && !defined(__GNUC__)
 #define MT_assert(predicate) assert(predicate)
 #else