diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index 38eb0094..0e66c31f 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -136,6 +136,10 @@
                 <File Name="launchctl-x86.exe" KeyPath="yes" />
             </Component>
 
+            <Component Id="C.diag.bat">
+                <File Name="diag.bat" Source="..\..\..\tools\diag.bat" KeyPath="yes" />
+            </Component>
+
             <Component Id="C.memfs_x64.exe">
                 <File Name="memfs-x64.exe" KeyPath="yes" />
                 <RegistryKey
@@ -268,6 +272,7 @@
             <ComponentRef Id="C.launcher_x86.exe.svcinst" />
             <ComponentRef Id="C.launchctl_x64.exe" />
             <ComponentRef Id="C.launchctl_x86.exe" />
+            <ComponentRef Id="C.diag.bat" />
         </ComponentGroup>
         <ComponentGroup Id="C.WinFsp.inc">
             <ComponentRef Id="C.fsctl.h" />
diff --git a/tools/diag.bat b/tools/diag.bat
index 401c352b..f9b04194 100644
--- a/tools/diag.bat
+++ b/tools/diag.bat
@@ -2,16 +2,18 @@
 
 setlocal
 
-echo WINFSP AND SSHFS-WIN INSTALLATION DIRECTORIES
+echo WINFSP INSTALLATION DIRECTORY
 reg query HKLM\SOFTWARE\WinFsp /reg:32
-reg query HKLM\SOFTWARE\SSHFS-Win /reg:32
 echo.
 
-echo WINFSP NETWORK PROVIDER DLL AND SSHFS REGISTRATIONS
+echo WINFSP DLL REGISTRATIONS
 reg query HKLM\SYSTEM\CurrentControlSet\Control\NetworkProvider\Order
 reg query HKLM\SYSTEM\CurrentControlSet\Services\WinFsp.Np\NetworkProvider
 reg query HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\WinFsp
-reg query HKLM\SYSTEM\CurrentControlSet\Services\WinFsp.Launcher\Services\sshfs
+echo.
+
+echo WINFSP LAUNCHER REGISTRATIONS
+reg query HKLM\SYSTEM\CurrentControlSet\Services\WinFsp.Launcher\Services /s
 echo.
 
 echo WINFSP FSD CONFIGURATION AND STATUS
@@ -20,7 +22,7 @@ sc qc WinFsp
 sc sdshow WinFsp
 echo.
 
-echo WINFSP.LAUNCHER CONFIGURATION AND STATUS
+echo WINFSP LAUNCHER SERVICE CONFIGURATION AND STATUS
 sc query WinFsp.Launcher
 sc qc WinFsp.Launcher
 sc sdshow WinFsp.Launcher