diff --git a/AMBuildScript b/AMBuildScript
index d860a851..8f170527 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -179,6 +179,7 @@ class SM:
 				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE')
 				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS')
 				self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE')
+				self.compiler.AddToListVar('CDEFINES', '_ITERATOR_DEBUG_LEVEL=0')
 				self.compiler.AddToListVar('CXXFLAGS', '/EHsc')
 				self.compiler.AddToListVar('CXXFLAGS', '/GR-')
 				self.compiler.AddToListVar('CFLAGS', '/W3')
diff --git a/core/AMBuilder b/core/AMBuilder
index 507c45c2..f5760941 100644
--- a/core/AMBuilder
+++ b/core/AMBuilder
@@ -44,7 +44,10 @@ for i in SM.sdkInfo:
 			except:
 				extension.AddCommand(SymlinkCommand(link, target))
 		elif AMBuild.target['platform'] == 'windows':
-			libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
+			if 'DEBUG' in compiler['CDEFINES']:
+				libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib')
+			else:
+				libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
 			binary.RebuildIfNewer(libPath)
 			binary['POSTLINKFLAGS'].append(libPath)