diff --git a/src/plugins/mpi/pmi2/kvs.c b/src/plugins/mpi/pmi2/kvs.c
index 1a99324d4b58e4d0ddcd21a2323a1f1227cd7dfe..85e0244f1b36429b8168c2d5a4a884a5ec54e033 100644
--- a/src/plugins/mpi/pmi2/kvs.c
+++ b/src/plugins/mpi/pmi2/kvs.c
@@ -116,9 +116,9 @@ temp_kvs_init(void)
 		/* XXX: TBC */
 		num_children = tree_info.num_children + 1;
 
-		pack32((uint32_t)nodeid, buf); /* from_nodeid */
+		pack32(nodeid, buf); /* from_nodeid */
 		packstr(tree_info.this_node, buf); /* from_node */
-		pack32((uint32_t)num_children, buf); /* num_children */
+		pack32(num_children, buf); /* num_children */
 		pack32(kvs_seq, buf);
 	} else {
 		pack32(kvs_seq, buf);
diff --git a/src/plugins/mpi/pmi2/tree.c b/src/plugins/mpi/pmi2/tree.c
index 30ad957c907d1c4efef68f87fe981f0b4cbd413b..0e140aab42fdcb7b4a815c8c7fadb885b2425752 100644
--- a/src/plugins/mpi/pmi2/tree.c
+++ b/src/plugins/mpi/pmi2/tree.c
@@ -135,7 +135,7 @@ _handle_kvs_fence(int fd, Buf buf)
 
 	temp_kvs_merge(buf);
 
-	if (children_to_wait == 0 && tasks_to_wait == 0) {
+	if ((children_to_wait == 0) && (tasks_to_wait == 0)) {
 		rc = temp_kvs_send();
 		if (rc != SLURM_SUCCESS) {
 			if (in_stepd()) {
@@ -179,13 +179,13 @@ _handle_kvs_fence_resp(int fd, Buf buf)
 	debug3("mpi/pmi2: in _handle_kvs_fence_resp");
 
 	safe_unpack32(&seq, buf);
-	if( seq == kvs_seq - 2) {
+	if (seq == kvs_seq - 2) {
 		debug("mpi/pmi2: duplicate KVS_FENCE_RESP "
 		      "seq %d kvs_seq %d from srun ignored", seq, kvs_seq);
 		return rc;
 	} else if (seq != kvs_seq - 1) {
-		error("mpi/pmi2: invalid kvs seq from srun, expect %u"
-		      " got %u", kvs_seq - 1, seq);
+		error("mpi/pmi2: invalid kvs seq from srun, expect %u got %u",
+		      kvs_seq - 1, seq);
 		rc = SLURM_ERROR;;
 		errmsg = "mpi/pmi2: invalid kvs seq from srun";
 		goto resp;