diff --git a/Ext2Mgr/Ext2Mgr.vcxproj b/Ext2Mgr/Ext2Mgr.vcxproj
index 68911b3..fe576a4 100644
--- a/Ext2Mgr/Ext2Mgr.vcxproj
+++ b/Ext2Mgr/Ext2Mgr.vcxproj
@@ -22,20 +22,20 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{E1AF85D7-0179-4CF0-B0D1-21AE72B6DC2E}</ProjectGuid>
     <RootNamespace>Ext2Mgr</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>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
@@ -43,14 +43,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
@@ -222,4 +222,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Ext2Srv/Ext2Srv.vcxproj b/Ext2Srv/Ext2Srv.vcxproj
index d5c4583..6f794ec 100644
--- a/Ext2Srv/Ext2Srv.vcxproj
+++ b/Ext2Srv/Ext2Srv.vcxproj
@@ -22,32 +22,32 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{6A5A0B13-7E05-4CA9-9A2B-FADF76DBAC20}</ProjectGuid>
     <RootNamespace>Ext2Srv</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>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -171,4 +171,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Ext4Fsd.sln b/Ext4Fsd.sln
index 6e5e485..0a89b26 100644
--- a/Ext4Fsd.sln
+++ b/Ext4Fsd.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.421
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ext2Mgr", "Ext2Mgr\Ext2Mgr.vcxproj", "{E1AF85D7-0179-4CF0-B0D1-21AE72B6DC2E}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/Ext4Fsd/Ext2Fsd.inf b/Ext4Fsd/Ext2Fsd.inf
index 727ad1f..f3b85c1 100644
--- a/Ext4Fsd/Ext2Fsd.inf
+++ b/Ext4Fsd/Ext2Fsd.inf
@@ -7,7 +7,7 @@
 ; Inf author: Stefan Kanthak <skanthak@nexgo.de>
 ; Updated for Windows 10: Bo Brantén <bosse@acc.umu.se>
 ;
-; Copyright (C) 2016, Stefan Kanthak, Matt Wu, Bo Brantén.
+; Copyright (C) 2016, 2020, Stefan Kanthak, Matt Wu, Bo Brantén.
 
 [Version]
 Class       = ExtendedFileSystem
@@ -21,22 +21,18 @@ CatalogFile = Ext2Fsd.cat
 [DefaultInstall.NTx86]
 AddReg     = Ext2Fsd.Install.AddReg
 CopyFiles  = Ext2Fsd.CopyFiles.Drv.NTx86
-CopyINF = "Ext2Fsd.inf"
 
 [DefaultInstall.NTamd64]
 AddReg     = Ext2Fsd.Install.AddReg
 CopyFiles  = Ext2Fsd.CopyFiles.Drv.NTamd64
-CopyINF = "Ext2Fsd.inf"
 
 [DefaultInstall.NTarm]
 AddReg     = Ext2Fsd.Install.AddReg
 CopyFiles  = Ext2Fsd.CopyFiles.Drv.NTarm
-CopyINF = "Ext2Fsd.inf"
 
 [DefaultInstall.NTarm64]
 AddReg     = Ext2Fsd.Install.AddReg
 CopyFiles  = Ext2Fsd.CopyFiles.Drv.NTarm64
-CopyINF = "Ext2Fsd.inf"
 
 [DefaultInstall.NTx86.Services]
 AddService = "%Ext2Fsd*Key%",%SVCINST_TAGTOFRONT%,Ext2Fsd.Service,Ext2Fsd.EventLog
@@ -54,25 +50,21 @@ AddService = "%Ext2Fsd*Key%",%SVCINST_TAGTOFRONT%,Ext2Fsd.Service,Ext2Fsd.EventL
 LegacyUninstall=1
 DelFiles   = Ext2Fsd.DelFiles.Drv.NTx86
 DelReg     = Ext2Fsd.Remove.DelReg
-Reboot
 
 [DefaultUninstall.NTamd64]
 LegacyUninstall=1
 DelFiles   = Ext2Fsd.DelFiles.Drv.NTamd64
 DelReg     = Ext2Fsd.Remove.DelReg
-Reboot
 
 [DefaultUninstall.NTarm]
 LegacyUninstall=1
 DelFiles   = Ext2Fsd.DelFiles.Drv.NTarm
 DelReg     = Ext2Fsd.Remove.DelReg
-Reboot
 
 [DefaultUninstall.NTarm64]
 LegacyUninstall=1
 DelFiles   = Ext2Fsd.DelFiles.Drv.NTarm64
 DelReg     = Ext2Fsd.Remove.DelReg
-Reboot
 
 [DefaultUninstall.NTx86.Services]
 DelService = "%Ext2Fsd*Key%",%SVCINST_DELETEEVENTLOGENTRY%