diff --git a/src/XMakeCommandLine/XMake.cs b/src/XMakeCommandLine/XMake.cs
index c595464ad9c..495b5b4f40a 100644
--- a/src/XMakeCommandLine/XMake.cs
+++ b/src/XMakeCommandLine/XMake.cs
@@ -1984,7 +1984,7 @@ private static void StartLocalNode(CommandLineSwitches commandLineSwitches)
 #if !STANDALONEBUILD
             else
             {
-                StartLocalNodeOldOM(nodeNumber);
+                StartLocalNodeOldOM(nodeModeNumber);
             }
 #endif
         }
diff --git a/src/XMakeTasks/Dependencies.cs b/src/XMakeTasks/Dependencies.cs
index 4b8b963c4c8..5c15c7d28f7 100644
--- a/src/XMakeTasks/Dependencies.cs
+++ b/src/XMakeTasks/Dependencies.cs
@@ -26,7 +26,7 @@ internal class Dependencies
         /// Hashtable of other dependency files.
         /// Key is filename and value is DependencyFile.
         /// </summary>
-        private Hashtable _dependencies = new Hashtable();
+        private Hashtable dependencies = new Hashtable();
 
         /// <summary>
         /// Look up a dependency file. Return null if its not there.
@@ -35,7 +35,7 @@ internal class Dependencies
         /// <returns></returns>
         internal DependencyFile GetDependencyFile(string filename)
         {
-            return (DependencyFile)_dependencies[filename];
+            return (DependencyFile)dependencies[filename];
         }
 
 
@@ -46,7 +46,7 @@ internal DependencyFile GetDependencyFile(string filename)
         /// <returns></returns>
         internal void AddDependencyFile(string filename, DependencyFile file)
         {
-            _dependencies[filename] = file;
+            dependencies[filename] = file;
         }
 
         /// <summary>
@@ -56,7 +56,7 @@ internal void AddDependencyFile(string filename, DependencyFile file)
         /// <returns></returns>
         internal void RemoveDependencyFile(string filename)
         {
-            _dependencies.Remove(filename);
+            dependencies.Remove(filename);
         }
 
         /// <summary>
@@ -64,7 +64,7 @@ internal void RemoveDependencyFile(string filename)
         /// </summary>
         internal void Clear()
         {
-            _dependencies.Clear();
+            dependencies.Clear();
         }
     }
 }
\ No newline at end of file
diff --git a/src/XMakeTasks/StateFileBase.cs b/src/XMakeTasks/StateFileBase.cs
index 57033ffeb06..33bc2db12dd 100644
--- a/src/XMakeTasks/StateFileBase.cs
+++ b/src/XMakeTasks/StateFileBase.cs
@@ -20,7 +20,7 @@ internal class StateFileBase
         // Current version for serialization. This should be changed when breaking changes
         // are made to this class.
         // Note: Consider that changes can break VS2015 RTM which did not have a version check.
-        private const byte CurrentSerializationVersion = 2;
+        private const byte CurrentSerializationVersion = 3;
 
         // Version this instance is serialized with.
         private byte _serializedVersion = CurrentSerializationVersion;