Fixed problem with Uninstaller and Shutdown handling of Diagnostic service.