diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi
index 4a5de4f85f9..9239eb07ec7 100644
--- a/admin/nt/dist-build/emacs.nsi
+++ b/admin/nt/dist-build/emacs.nsi
@@ -72,6 +72,9 @@ Section
 
   # add registry key to enable uninstall from control panel
   WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "GNU Emacs ${VERSION_BRANCH}"
+  WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$\"$UninstallerPath$\""
+  WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${VERSION_BRANCH}"
+  WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "Free Software Foundation, Inc."
   WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$UninstallerPath$\""
 
   ;Create shortcuts
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 0e3aecdf313..38411ddee3d 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -134,11 +134,11 @@ package @file{pp.el}):
 ;; (pp-to-string '('a 'b))                ; same as above
 @end lisp
 
-The code contained in these comments can be evaluated from time to
-time to compare the output with the expected output.  ERT formalizes
-this and introduces a common convention, which simplifies Emacs
-development, since programmers no longer have to manually find and
-evaluate such comments.
+The Lisp forms contained in these comments can be evaluated from time to
+time, e.g. with @kbd{C-x C-e}, to compare the output with the expected
+output.  ERT formalizes this and introduces a common convention, which
+simplifies Emacs development, since programmers no longer have to
+manually find and evaluate such comments.
 
 An ERT test definition equivalent to the above comments is this: