diff --git a/orte/mca/pls/rsh/pls_rsh_module.c b/orte/mca/pls/rsh/pls_rsh_module.c
index 6190e1ead3..b2ca7a8ac2 100644
--- a/orte/mca/pls/rsh/pls_rsh_module.c
+++ b/orte/mca/pls/rsh/pls_rsh_module.c
@@ -221,7 +221,6 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
     char **argv, **tmp;
     int argc;
     int rc;
-    int id;
     sigset_t sigs;
     struct passwd *p;
     bool remote_bash = false, remote_csh = false;
@@ -316,21 +315,7 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
     opal_argv_append(&argc, &argv, mca_pls_rsh_component.orted);
     
     /* check for debug flags */
-    id = mca_base_param_register_int("orte","debug",NULL,NULL,0);
-    mca_base_param_lookup_int(id,&rc);
-    if (rc) {
-         opal_argv_append(&argc, &argv, "--debug");
-    }
-    id = mca_base_param_register_int("orte","debug","daemons",NULL,0);
-    mca_base_param_lookup_int(id,&rc);
-    if (rc) {
-         opal_argv_append(&argc, &argv, "--debug-daemons");
-    }
-    id = mca_base_param_register_int("orte","debug","daemons_file",NULL,0);
-    mca_base_param_lookup_int(id,&rc);
-    if (rc) {
-         opal_argv_append(&argc, &argv, "--debug-daemons-file");
-    }
+    orte_pls_base_proxy_mca_argv(&argc, &argv);
 
     opal_argv_append(&argc, &argv, "--bootproxy");
     opal_argv_append(&argc, &argv, jobid_string);
diff --git a/orte/mca/pls/tm/pls_tm_component.c b/orte/mca/pls/tm/pls_tm_component.c
index e6f7cb415d..833b6b8b85 100644
--- a/orte/mca/pls/tm/pls_tm_component.c
+++ b/orte/mca/pls/tm/pls_tm_component.c
@@ -22,11 +22,11 @@
 
 #include "ompi_config.h"
 
-#include "include/orte_constants.h"
-#include "mca/pls/pls.h"
-#include "mca/pls/base/base.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "orte/include/orte_constants.h"
+#include "orte/mca/pls/pls.h"
+#include "orte/mca/pls/base/base.h"
 #include "pls_tm.h"
-#include "mca/base/mca_base_param.h"
 
 
 /*
diff --git a/orte/mca/pls/tm/pls_tm_module.c b/orte/mca/pls/tm/pls_tm_module.c
index 6d574f8d76..75e94e1388 100644
--- a/orte/mca/pls/tm/pls_tm_module.c
+++ b/orte/mca/pls/tm/pls_tm_module.c
@@ -34,27 +34,27 @@
 #include <errno.h>
 #include <tm.h>
 
-#include "pls_tm.h"
-#include "include/orte_constants.h"
-#include "include/orte_types.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
 #include "opal/util/opal_environ.h"
-#include "runtime/runtime.h"
-#include "runtime/orte_wait.h"
-#include "mca/base/mca_base_param.h"
-#include "mca/rmgr/base/base.h"
-#include "mca/rmaps/base/rmaps_base_map.h"
-#include "mca/pls/pls.h"
-#include "mca/pls/base/base.h"
-#include "mca/errmgr/errmgr.h"
-#include "mca/soh/soh_types.h"
-#include "mca/gpr/gpr.h"
-#include "orte/mca/sds/base/base.h"
-#include "mca/soh/soh.h"
-#include "mca/rml/rml.h"
-#include "mca/ns/ns.h"
+#include "opal/mca/base/mca_base_param.h"
 #include "opal/runtime/opal_progress.h"
+#include "orte/include/orte_constants.h"
+#include "orte/include/orte_types.h"
+#include "orte/runtime/runtime.h"
+#include "orte/runtime/orte_wait.h"
+#include "orte/mca/rmgr/base/base.h"
+#include "orte/mca/rmaps/base/rmaps_base_map.h"
+#include "orte/mca/pls/pls.h"
+#include "orte/mca/pls/base/base.h"
+#include "orte/mca/errmgr/errmgr.h"
+#include "orte/mca/soh/soh_types.h"
+#include "orte/mca/gpr/gpr.h"
+#include "orte/mca/sds/base/base.h"
+#include "orte/mca/soh/soh.h"
+#include "orte/mca/rml/rml.h"
+#include "orte/mca/ns/ns.h"
+#include "pls_tm.h"
 
 
 /*
@@ -97,7 +97,6 @@ pls_tm_launch(orte_jobid_t jobid)
     char **argv;
     int argc;
     int rc;
-    int id;
     bool connected = false;
     
     /* query the list of nodes allocated to the job - don't need the entire
@@ -138,21 +137,7 @@ pls_tm_launch(orte_jobid_t jobid)
     opal_argv_append(&argc, &argv, "--no-daemonize");
     
     /* check for debug flags */
-    id = mca_base_param_register_int("orte","debug",NULL,NULL,0);
-    mca_base_param_lookup_int(id,&rc);
-    if (rc) {
-         opal_argv_append(&argc, &argv, "--debug");
-    }
-    id = mca_base_param_register_int("orte","debug","daemons",NULL,0);
-    mca_base_param_lookup_int(id,&rc);
-    if (rc) {
-         opal_argv_append(&argc, &argv, "--debug-daemons");
-    }
-    id = mca_base_param_register_int("orte","debug","daemons_file",NULL,0);
-    mca_base_param_lookup_int(id,&rc);
-    if (rc) {
-         opal_argv_append(&argc, &argv, "--debug-daemons-file");
-    }
+    orte_pls_base_proxy_mca_argv(&argc, &argv);
 
     /* proxy information */
     opal_argv_append(&argc, &argv, "--bootproxy");
@@ -253,7 +238,7 @@ pls_tm_launch(orte_jobid_t jobid)
         /* setup process name */
         rc = orte_ns.get_proc_name_string(&name_string, name);
         if (ORTE_SUCCESS != rc) {
-            opal_output(0, "orte_pls_tm: unable to create process name");
+            opal_output(0, "pls:tm: unable to create process name");
             exit(-1);
         }
         argv[proc_name_index] = name_string;