diff --git a/Nodejs/NodejsTools.sln b/Nodejs/NodejsTools.sln
index 18d5f3c4d..9950fa5f3 100644
--- a/Nodejs/NodejsTools.sln
+++ b/Nodejs/NodejsTools.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26507.0
+VisualStudioVersion = 15.0.26510.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs", "Product\Nodejs\Nodejs.csproj", "{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs", "Product\Nodejs\No
 		{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogConverter", "Product\LogConverter\LogConverter.csproj", "{9A69745F-546D-40A0-8770-7E5B9ED0C82F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWindow", "Product\InteractiveWindow\InteractiveWindow.csproj", "{24A3887F-DA50-4989-8D6C-4A5B04D5D457}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Product", "Product", "{F9719B35-F359-47A7-A2F8-34F42E53C809}"
@@ -35,10 +33,6 @@ Global
 		{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|x86.Build.0 = Debug|x86
 		{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.ActiveCfg = Release|x86
 		{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.Build.0 = Release|x86
-		{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Debug|x86.ActiveCfg = Debug|x86
-		{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Debug|x86.Build.0 = Debug|x86
-		{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Release|x86.ActiveCfg = Release|x86
-		{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Release|x86.Build.0 = Release|x86
 		{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.ActiveCfg = Debug|x86
 		{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.Build.0 = Debug|x86
 		{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|x86.ActiveCfg = Release|x86
@@ -69,7 +63,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{32EC5259-98DA-40CA-9E2D-1B1B2E966F88} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
-		{9A69745F-546D-40A0-8770-7E5B9ED0C82F} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
 		{24A3887F-DA50-4989-8D6C-4A5B04D5D457} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
 		{DBC73DF7-1B4C-48BE-8B48-715297487E7A} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
 		{712D84EC-B2A6-46D1-B030-BA697AE5E554} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate
index 0eef2bd62..6c3cc8ce5 100644
--- a/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3023"/>
     <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3024"/>
-    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="0"/>
+    <Icon Package="{AAB75614-2F8F-4DA6-B0A6-763C6DBB2969}" ID="2200"/>
     <ProjectType>Node.js</ProjectType>
     <DefaultName>Json.json</DefaultName>
     <SortOrder>420</SortOrder>
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate
index 54414796c..a7bc617a0 100644
--- a/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3038"/>
     <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3039"/>
-    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="0"/>
+    <Icon Package="{AAB75614-2F8F-4DA6-B0A6-763C6DBB2969}" ID="2100"/>
     <ProjectType>Node.js</ProjectType>
     <DefaultName>StyleSheet.less</DefaultName>
     <SortOrder>450</SortOrder>
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate
index 3023ae072..737cadfa2 100644
--- a/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3017"/>
     <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3018"/>
-    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3"/>
+    <Icon Package="{2ffe45c4-5c73-493c-b187-f2e955ff875e}" ID="3"></Icon>
     <ProjectType>Node.js</ProjectType>
     <DefaultName>TypeScript.ts</DefaultName>
     <SortOrder>200</SortOrder>
diff --git a/Nodejs/Product/Npm/SPI/RootPackage.cs b/Nodejs/Product/Npm/SPI/RootPackage.cs
index 1aeac5d45..1cb8ff3ea 100644
--- a/Nodejs/Product/Npm/SPI/RootPackage.cs
+++ b/Nodejs/Product/Npm/SPI/RootPackage.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using Microsoft.CSharp.RuntimeBinder;
 
 namespace Microsoft.NodejsTools.Npm.SPI
@@ -54,11 +55,11 @@ public RootPackage(
 
         public string Path { get; }
 
-        public IEnumerable<string> Homepages => this.PackageJson?.Homepages;
+        public IEnumerable<string> Homepages => this.PackageJson?.Homepages ?? Enumerable.Empty<string>();
 
         public bool HasPackageJson => this.PackageJson != null;
 
-        public string Name => this.HasPackageJson ? new DirectoryInfo(this.Path).Name : this.PackageJson.Name;
+        public string Name => this.PackageJson?.Name ?? new DirectoryInfo(this.Path).Name;
 
         public SemverVersion Version => this.PackageJson?.Version ?? new SemverVersion();
 
@@ -67,4 +68,3 @@ public RootPackage(
         public string Description => this.PackageJson?.Description;
     }
 }
-