diff --git a/src/tools/ompi_info/ompi_info.cc b/src/tools/ompi_info/ompi_info.cc
index 25e679f394..b787ebf9fe 100644
--- a/src/tools/ompi_info/ompi_info.cc
+++ b/src/tools/ompi_info/ompi_info.cc
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
     acted = true;
   }
   if (want_all || ompi_cmd_line_is_taken(cmd_line, "param")) {
-    do_params();
+    do_params(want_all);
     acted = true;
   }
 
diff --git a/src/tools/ompi_info/ompi_info.h b/src/tools/ompi_info/ompi_info.h
index df6471ba99..5ac5cb1475 100644
--- a/src/tools/ompi_info/ompi_info.h
+++ b/src/tools/ompi_info/ompi_info.h
@@ -63,7 +63,7 @@ namespace ompi_info {
   extern std::string path_pkglibdir;
   extern std::string path_sysconfdir;
 
-  void do_params();
+  void do_params(bool want_all);
   void show_mca_params(const std::string& type, const std::string& component, 
                        const std::string& param);
 
diff --git a/src/tools/ompi_info/param.cc b/src/tools/ompi_info/param.cc
index 0de785f61d..853c496590 100644
--- a/src/tools/ompi_info/param.cc
+++ b/src/tools/ompi_info/param.cc
@@ -44,11 +44,11 @@ string ompi_info::path_sysconfdir = "sysconfdir";
 extern ompi_value_array_t mca_base_params;
 
 
-void ompi_info::do_params()
+void ompi_info::do_params(bool want_all)
 {
   unsigned int count;
   string type, component;
-  bool found, want_all;
+  bool found;
   ompi_info::type_vector_t::size_type i;
 
   ompi_info::open_components();
@@ -56,7 +56,6 @@ void ompi_info::do_params()
   // See if the special param "all" was givin to --param; that
   // superceeds any individual type
 
-  want_all = false;
   count = ompi_cmd_line_get_ninsts(cmd_line, "param");
   for (i = 0; i < count; ++i) {
     type = ompi_cmd_line_get_param(cmd_line, "param", i, 0);
@@ -400,7 +399,7 @@ void ompi_info::do_config(bool want_all)
         WRAPPER_EXTRA_LIBS);
   }
 
-  out("Debug support", "option:debug", debug);
+  out("Intenral debug support", "option:debug", debug);
   out("MPI parameter check", "option:mpi-param-check", paramcheck);
   out("Memory profiling support", "option:mem-profile", memprofile);
   out("Memory debugging support", "option:mem-debug", memdebug);