diff --git a/LuaDebugAttacher_x64/LuaDebugAttacher_x64.vcxproj b/LuaDebugAttacher_x64/LuaDebugAttacher_x64.vcxproj
index c38ab2d..44331e6 100644
--- a/LuaDebugAttacher_x64/LuaDebugAttacher_x64.vcxproj
+++ b/LuaDebugAttacher_x64/LuaDebugAttacher_x64.vcxproj
@@ -14,19 +14,19 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{4D877B09-CA72-4416-B2F9-B4E243C0D51F}</ProjectGuid>
     <RootNamespace>LuaDebugAttacherx64</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/LuaDebugHelper_x64/LuaDebugHelper_x64.vcxproj b/LuaDebugHelper_x64/LuaDebugHelper_x64.vcxproj
index f5a74ba..764594b 100644
--- a/LuaDebugHelper_x64/LuaDebugHelper_x64.vcxproj
+++ b/LuaDebugHelper_x64/LuaDebugHelper_x64.vcxproj
@@ -15,19 +15,19 @@
     <ProjectGuid>{D0A573AC-3559-4D68-B617-0EEC056FA018}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>LuaDebugHelperx64</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/LuaDebugHelper_x86/LuaDebugHelper_x86.vcxproj b/LuaDebugHelper_x86/LuaDebugHelper_x86.vcxproj
index e23d2ca..292a6cb 100644
--- a/LuaDebugHelper_x86/LuaDebugHelper_x86.vcxproj
+++ b/LuaDebugHelper_x86/LuaDebugHelper_x86.vcxproj
@@ -15,19 +15,19 @@
     <ProjectGuid>{043C0981-A01F-46F4-A19C-FDCD72973492}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>LuaDebugHelperx86</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/LuaDkmDebugger/LuaDkmDebugger.csproj b/LuaDkmDebugger/LuaDkmDebugger.csproj
index b29eb0b..abc421a 100644
--- a/LuaDkmDebugger/LuaDkmDebugger.csproj
+++ b/LuaDkmDebugger/LuaDkmDebugger.csproj
@@ -83,7 +83,10 @@
     <PackageReference Include="Microsoft.VisualStudio.Threading">
       <Version>15.8.209</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.5.2047" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5233">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\LuaDkmDebuggerShared\.pkgdef">
diff --git a/LuaDkmDebuggerComponent/LuaSymbolStore.cs b/LuaDkmDebuggerComponent/LuaSymbolStore.cs
index 0521c1f..2de7298 100644
--- a/LuaDkmDebuggerComponent/LuaSymbolStore.cs
+++ b/LuaDkmDebuggerComponent/LuaSymbolStore.cs
@@ -87,7 +87,18 @@ public void AddScriptSource(string scriptName, string scriptContent, byte[] sha1
             if (!knownScripts.ContainsKey(scriptName))
                 knownScripts.Add(scriptName, new LuaScriptSymbols { sourceFileName = scriptName, scriptContent = scriptContent, sha1Hash = sha1Hash });
             else
+            {
+                if(knownSources.ContainsKey(scriptName))
+                {
+                    var sourceSymbols = knownSources[scriptName];
+                    if(functionNames.ContainsKey(sourceSymbols.address))
+                    {
+                        functionNames.Remove(sourceSymbols.address);
+                    }
+                    knownSources.Remove(scriptName);
+                }
                 knownScripts[scriptName] = new LuaScriptSymbols { sourceFileName = scriptName, scriptContent = scriptContent, sha1Hash = sha1Hash };
+            }
         }
 
         public LuaScriptSymbols FetchScriptSource(string sourceFileName)