diff --git a/doc/sphinx/CaliperBasics.rst b/doc/sphinx/CaliperBasics.rst
index d4ff564af..ae8627313 100644
--- a/doc/sphinx/CaliperBasics.rst
+++ b/doc/sphinx/CaliperBasics.rst
@@ -92,7 +92,7 @@ An easy way to do this is to use one of Caliper's built-in measurement
 configurations. For example, the `runtime-report` config prints out the time
 spent in the annotated regions. You can activate built-in measurement
 configurations with the :ref:`configmgr_api` or with the
-:doc:envvar:`CALI_CONFIG` environment variable.
+:envvar:`CALI_CONFIG` environment variable.
 Let's try this on Caliper's cxx-example program:
 
 .. code-block:: sh
@@ -273,7 +273,7 @@ Notes:
 
 * Multiple ConfigManager objects can co-exist in a program.
 * The ConfigManager API can be used in combination with
-  the :doc:envvar:`CALI_CONFIG` environment variable or manual
+  the :envvar:`CALI_CONFIG` environment variable or manual
   configurations.
 
 .. _more-on-configurations:
@@ -282,7 +282,7 @@ More on configurations
 --------------------------------
 
 A configuration string for the ConfigManager API or the
-:doc:envvar:`CALI_CONFIG` environment variable is a comma-separated list of
+:envvar:`CALI_CONFIG` environment variable is a comma-separated list of
 *configs* and *parameters*.
 
 A *config* is the name of one of Caliper's built-in measurement configurations,
diff --git a/doc/sphinx/configuration.rst b/doc/sphinx/configuration.rst
index d57874293..69d7d6391 100644
--- a/doc/sphinx/configuration.rst
+++ b/doc/sphinx/configuration.rst
@@ -118,7 +118,7 @@ Configuration variables
 ........................................
 
 These variables can be set using environment variables, config files,
-or the configuration API).
+or the configuration API.
 
 CALI_CONFIG_FILE
    Comma-separated list of configuration files. The provided
diff --git a/src/caliper/controllers/OpenMPReportController.cpp b/src/caliper/controllers/OpenMPReportController.cpp
index 3c3da29f5..be87d5815 100644
--- a/src/caliper/controllers/OpenMPReportController.cpp
+++ b/src/caliper/controllers/OpenMPReportController.cpp
@@ -134,7 +134,7 @@ make_controller(const char* name, const config_map_t& initial_cfg, const cali::C
 const char* controller_spec =
     "{"
     " \"name\"        : \"openmp-report\","
-    " \"description\" : \"Record and print CUDA activities (kernel executions, memcopies, etc.)\","
+    " \"description\" : \"Record and print OpenMP performance metrics (loops, barriers, etc.)\","
     " \"categories\"  : [ \"output\", \"region\", \"metric\" ],"
     " \"services\"    : [ \"aggregate\", \"ompt\", \"event\" ],"
     " \"config\"      : "