diff --git a/runtime/Cpp/runtime/src/support/StringUtils.h b/runtime/Cpp/runtime/src/support/StringUtils.h
index ac0fcc765..dc80c077b 100644
--- a/runtime/Cpp/runtime/src/support/StringUtils.h
+++ b/runtime/Cpp/runtime/src/support/StringUtils.h
@@ -24,7 +24,7 @@ namespace antlrcpp {
     // Don't make the converter static or we have to serialize access to it.
     UTF32Converter converter;
 
-    #if _MSC_VER > 1900 && _MSC_VER < 2000
+    #if _MSC_VER >= 1900 && _MSC_VER < 2000
       auto p = reinterpret_cast<const int32_t *>(data.data());
       return converter.to_bytes(p, p + data.size());
     #else
@@ -36,7 +36,7 @@ namespace antlrcpp {
   {
     UTF32Converter converter;
 
-    #if _MSC_VER > 1900 && _MSC_VER < 2000
+    #if _MSC_VER >= 1900 && _MSC_VER < 2000
       auto r = converter.from_bytes(first, last);
       i32string s = reinterpret_cast<const int32_t *>(r.data());
     #else
diff --git a/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp b/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp
index a7fe749db..0f806d4e7 100755
--- a/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp
+++ b/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp
@@ -20,8 +20,8 @@ Token* TerminalNodeImpl::getSymbol() {
   return symbol;
 }
 
-void TerminalNodeImpl::setParent(RuleContext *parent) {
-  this->parent = parent;
+void TerminalNodeImpl::setParent(RuleContext *parent_) {
+  this->parent = parent_;
 }
 
 misc::Interval TerminalNodeImpl::getSourceInterval() {