diff --git a/orte/mca/gpr/gpr.h b/orte/mca/gpr/gpr.h
index 7c0223e13e..6c4eb91776 100644
--- a/orte/mca/gpr/gpr.h
+++ b/orte/mca/gpr/gpr.h
@@ -111,6 +111,7 @@ typedef int (*orte_gpr_base_module_stop_compound_cmd_fn_t)(void);
  * executed. Failure of any command contained in the compound command will terminate
  * execution of the compound command list and return an error to the caller.
  *
+ * @param none
  * @retval ORTE_SUCCESS All commands in the list were successfully executed.
  * @retval ORTE_ERROR(s) A command in the list failed, returning the indicated
  * error code.
@@ -123,7 +124,8 @@ typedef int (*orte_gpr_base_module_stop_compound_cmd_fn_t)(void);
 typedef int (*orte_gpr_base_module_exec_compound_cmd_fn_t)(void);
 
 
-/* Cleanup a job from the registry
+/*
+ * Cleanup a job from the registry
  * Remove all references to a given job from the registry. This includes removing
  * all segments "owned" by the job, and removing all process names from dictionaries
  * in the registry.
@@ -140,7 +142,8 @@ typedef int (*orte_gpr_base_module_exec_compound_cmd_fn_t)(void);
  */
 typedef int (*orte_gpr_base_module_cleanup_job_fn_t)(orte_jobid_t jobid);
 
-/* Cleanup a process from the registry
+/*
+ * Cleanup a process from the registry
  * Remove all references to a given process from the registry. This includes removing
  * the process name from all dictionaries in the registry, all subscriptions, etc.
  * It also includes reducing any synchros on the job segment.
diff --git a/orte/runtime/orte_init_stage1.c b/orte/runtime/orte_init_stage1.c
index 032f44b3a7..1784c7ddd2 100644
--- a/orte/runtime/orte_init_stage1.c
+++ b/orte/runtime/orte_init_stage1.c
@@ -79,13 +79,11 @@ int orte_init_stage1(bool infrastructure)
     orte_jobid_t my_jobid;
     orte_cellid_t my_cellid;
 
-    /* register handler for errnum -> string converstion */
+    /* register handler for errnum -> string conversion */
     opal_error_register("ORTE", ORTE_ERR_BASE, ORTE_ERR_MAX, orte_err2str);
 
     /* Register all MCA Params */
-    /* AWF - uh, is ORTE_ERROR_LOG really available yet? */
     if (ORTE_SUCCESS != (ret = orte_register_params(infrastructure))) {
-        ORTE_ERROR_LOG(ret);
         error = "orte_register_params";
         goto error;
     }
@@ -112,7 +110,6 @@ int orte_init_stage1(bool infrastructure)
      * Initialize the data storage service.
      */
     if (ORTE_SUCCESS != (ret = orte_dss_open())) {
-        ORTE_ERROR_LOG(ret);
         error = "orte_dss_open";
         goto error;
     }
@@ -450,11 +447,11 @@ int orte_init_stage1(bool infrastructure)
     }
 
     /*
-     * setup the errmgr
+     * setup the errmgr -- open has been done way before
      */
     if (ORTE_SUCCESS != (ret = orte_errmgr_base_select())) {
         ORTE_ERROR_LOG(ret);
-        error = "orte_smr_base_select";
+        error = "orte_errmgr_base_select";
         goto error;
     }