diff --git a/opal/mca/db/pmi/db_pmi.c b/opal/mca/db/pmi/db_pmi.c
index 49510fb5ed..30620c3699 100644
--- a/opal/mca/db/pmi/db_pmi.c
+++ b/opal/mca/db/pmi/db_pmi.c
@@ -196,7 +196,7 @@ static int store(const opal_identifier_t *uid,
                     }
                 }
                 if (!subbed) {
-                    ptr[k++] = str[i];
+                    ptr[k++] = str[n];
                 }
             }
             /* pass the result */
diff --git a/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c b/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
index 09b113f015..8847f2b121 100644
--- a/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
+++ b/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
@@ -219,7 +219,7 @@ static int modex(orte_grpcomm_collective_t *coll)
         fields = opal_argv_split(cptr, ',');
         free(cptr);
         /* sanity check */
-        if (6 != opal_argv_count(fields)) {
+        if (4 > opal_argv_count(fields)) {
             ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM);
             opal_argv_free(fields);
             return ORTE_ERR_BAD_PARAM;