diff --git a/ompi/info/info.c b/ompi/info/info.c
index fc3a822b84..3ed7253aa1 100644
--- a/ompi/info/info.c
+++ b/ompi/info/info.c
@@ -275,7 +275,7 @@ int ompi_info_set (ompi_info_t *info, const char *key, const char *value)
 int ompi_info_set_value_enum (ompi_info_t *info, const char *key, int value,
                               mca_base_var_enum_t *var_enum)
 {
-    char *string_value;
+    const char *string_value;
     int ret;
 
     ret = var_enum->string_from_value (var_enum, value, &string_value);
diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.c b/orte/mca/rmaps/rank_file/rmaps_rank_file.c
index c3a03638ea..5fad8b8ced 100644
--- a/orte/mca/rmaps/rank_file/rmaps_rank_file.c
+++ b/orte/mca/rmaps/rank_file/rmaps_rank_file.c
@@ -216,7 +216,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata)
                         /* all would be oversubscribed, so take the least loaded one */
                         k = UINT32_MAX;
                         OPAL_LIST_FOREACH(nd, &node_list, orte_node_t) {
-                            if (nd->num_procs < k) {
+                            if (nd->num_procs < (orte_vpid_t)k) {
                                 k = nd->num_procs;
                                 node = nd;
                             }