diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
index b53ac3378..ac88edf63 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@@ -744,12 +744,11 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT = \
+    @abs_top_srcdir@/docs/mainpage.dox \
     @abs_top_srcdir@/RELEASE_NOTES.md \
     @abs_top_srcdir@/docs/COPYRIGHT.dox \
-    @abs_top_srcdir@/docs/mainpage.dox \
     @abs_top_srcdir@/docs/FAQ.md \
     @abs_top_srcdir@/docs/architecture.dox \
-    @abs_top_srcdir@/docs/groups.dox \
     @abs_top_srcdir@/docs/install.md \
     @abs_top_srcdir@/docs/install-fortran.md \
     @abs_top_srcdir@/docs/dispatch.dox \
diff --git a/docs/guide.dox b/docs/guide.dox
index 4f5acfa24..f30ef138b 100644
--- a/docs/guide.dox
+++ b/docs/guide.dox
@@ -1452,8 +1452,6 @@ array section access instead.
 
 \tableofcontents
 
-\todo Indent the following part below this.
-
 \section  classic_file_parts Parts of a NetCDF Classic File
 
 A netCDF classic or 64-bit offset dataset is stored as a single file
@@ -3745,8 +3743,6 @@ inadvertent reading of values that haven't been written.
 
 \tableofcontents
 
-\todo Wrap the following group of pages into this.  From NetCDF Classic Format Spec through HDF4 SD Format.
-
 \section classic_format_spec The NetCDF Classic Format Specification
 
 To present the format more formally, we use a BNF grammar notation. In
diff --git a/libdispatch/derror.c b/libdispatch/derror.c
index 059dc0dd3..1180cdf4c 100644
--- a/libdispatch/derror.c
+++ b/libdispatch/derror.c
@@ -13,10 +13,12 @@ Research/Unidata. See COPYRIGHT file for more info.
 static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $";
 
 /**
-\ingroup lib_version
-Return the library version.
+\defgroup lib_version Library Version
+  Functions related to querying the library version.
 
-\returns short string that contains the version information for the
+  Return the library version.
+
+  \returns short string that contains the version information for the
 library.
  */
 const char *
diff --git a/libdispatch/dtype.c b/libdispatch/dtype.c
index b85aaa78a..a4eaa754c 100644
--- a/libdispatch/dtype.c
+++ b/libdispatch/dtype.c
@@ -40,7 +40,7 @@ type). Read attributes of the new type with nc_get_att (see
 
 
 /** \internal
-\addtogroup user_types
+\ingroup user_types
 Learn if two types are equal
 
 \param ncid1 \ref ncid of first typeid.