diff --git a/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_del_index.c b/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_del_index.c
index 354be69863..00a1015d5b 100644
--- a/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_del_index.c
+++ b/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_del_index.c
@@ -80,7 +80,7 @@ int orte_gpr_base_pack_delete_entries(orte_buffer_t *cmd,
     }
 
     /* pack number of tokens */
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, &n, 1, ORTE_SIZE))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, (int*)&n, 1, ORTE_INT))) {
         return rc;
     }
 
@@ -102,7 +102,7 @@ int orte_gpr_base_pack_delete_entries(orte_buffer_t *cmd,
     }
 
     /* pack number of keys */
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, &n, 1, ORTE_SIZE))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, (int*)&n, 1, ORTE_INT))) {
         return rc;
     }
 
diff --git a/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c b/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c
index aae2ebcb8a..5e6b8bec14 100644
--- a/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c
+++ b/src/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c
@@ -60,7 +60,7 @@ int orte_gpr_base_pack_get(orte_buffer_t *cmd,
     orte_gpr_cmd_flag_t command;
     char **ptr;
     int rc;
-    int32_t n;
+    int n;
 
     command = ORTE_GPR_GET_CMD;
 
@@ -86,7 +86,7 @@ int orte_gpr_base_pack_get(orte_buffer_t *cmd,
     }
 
     /* pack number of tokens */
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, &n, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, &n, 1, ORTE_INT))) {
       return rc;
     }
     
@@ -106,7 +106,7 @@ int orte_gpr_base_pack_get(orte_buffer_t *cmd,
     }
 
     /* pack number of keys */
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, &n, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, &n, 1, ORTE_INT))) {
       return rc;
     }
     
diff --git a/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_arithmetic_ops.c b/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_arithmetic_ops.c
index ed150bd9c2..1ef9e8de2e 100644
--- a/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_arithmetic_ops.c
+++ b/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_arithmetic_ops.c
@@ -77,7 +77,7 @@ int orte_gpr_base_unpack_decrement_value(orte_buffer_t *cmd, int *ret)
     }
 
     n=1;
-    if (ORTE_SUCCESS != (rc = orte_dps.unpack(cmd, ret, &n, ORTE_INT))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.unpack(cmd, ret, &n, ORTE_INT32))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
diff --git a/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c b/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c
index 8721a4b5d2..82871359d1 100644
--- a/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c
+++ b/src/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c
@@ -63,8 +63,7 @@ int orte_gpr_base_unpack_put(orte_buffer_t *buffer, int *ret)
 int orte_gpr_base_unpack_get(orte_buffer_t *buffer, int *ret, int *cnt, orte_gpr_value_t ***values)
 {
     orte_gpr_cmd_flag_t command;
-    int rc;
-    int32_t num;
+    int rc, num;
     size_t n;
 
     n=1;
@@ -79,7 +78,7 @@ int orte_gpr_base_unpack_get(orte_buffer_t *buffer, int *ret, int *cnt, orte_gpr
     }
 
     /* find out how many values came back */
-    if (ORTE_SUCCESS != (rc = orte_dps.unpack(buffer, &num, &n, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.unpack(buffer, &num, &n, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
diff --git a/src/mca/gpr/replica/communications/gpr_replica_arithmetic_ops_cm.c b/src/mca/gpr/replica/communications/gpr_replica_arithmetic_ops_cm.c
index 0d613f3ec6..a3d9b82ba9 100644
--- a/src/mca/gpr/replica/communications/gpr_replica_arithmetic_ops_cm.c
+++ b/src/mca/gpr/replica/communications/gpr_replica_arithmetic_ops_cm.c
@@ -37,8 +37,7 @@ int orte_gpr_replica_recv_increment_value_cmd(orte_buffer_t *cmd, orte_buffer_t
     orte_gpr_replica_segment_t *seg=NULL;
     orte_gpr_replica_itag_t *itags=NULL;
     size_t n;
-    int rc;
-    int32_t ret;
+    int rc, ret;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &command, 1, ORTE_GPR_CMD))) {
         ORTE_ERROR_LOG(rc);
@@ -86,7 +85,7 @@ int orte_gpr_replica_recv_increment_value_cmd(orte_buffer_t *cmd, orte_buffer_t
     }
 
  RETURN_ERROR:
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
@@ -101,8 +100,7 @@ int orte_gpr_replica_recv_decrement_value_cmd(orte_buffer_t *cmd, orte_buffer_t
     orte_gpr_replica_segment_t *seg=NULL;
     orte_gpr_replica_itag_t *itags=NULL;
     size_t n;
-    int rc;
-    int32_t ret;
+    int rc, ret;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &command, 1, ORTE_GPR_CMD))) {
         ORTE_ERROR_LOG(rc);
@@ -150,7 +148,7 @@ int orte_gpr_replica_recv_decrement_value_cmd(orte_buffer_t *cmd, orte_buffer_t
     }
     
  RETURN_ERROR:
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
diff --git a/src/mca/gpr/replica/communications/gpr_replica_cleanup_cm.c b/src/mca/gpr/replica/communications/gpr_replica_cleanup_cm.c
index ec5194fcab..fb60619467 100644
--- a/src/mca/gpr/replica/communications/gpr_replica_cleanup_cm.c
+++ b/src/mca/gpr/replica/communications/gpr_replica_cleanup_cm.c
@@ -36,7 +36,7 @@ int orte_gpr_replica_recv_cleanup_job_cmd(orte_buffer_t *input_buffer,
     orte_gpr_cmd_flag_t command=ORTE_GPR_CLEANUP_JOB_CMD;
     orte_jobid_t jobid=0;
     size_t n;
-    int32_t rc, ret;
+    int rc, ret;
     
     if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &command, 1, ORTE_GPR_CMD))) {
         ORTE_ERROR_LOG(rc);
@@ -56,7 +56,7 @@ int orte_gpr_replica_recv_cleanup_job_cmd(orte_buffer_t *input_buffer,
     }
     
 RETURN_ERROR:
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
@@ -71,7 +71,7 @@ int orte_gpr_replica_recv_cleanup_proc_cmd(orte_buffer_t *input_buffer,
     orte_gpr_cmd_flag_t command=ORTE_GPR_CLEANUP_PROC_CMD;
     orte_process_name_t proc;
     size_t n;
-    int32_t rc, ret;
+    int rc, ret;
     
     if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &command, 1, ORTE_GPR_CMD))) {
         ORTE_ERROR_LOG(rc);
@@ -91,7 +91,7 @@ int orte_gpr_replica_recv_cleanup_proc_cmd(orte_buffer_t *input_buffer,
     }
     
 RETURN_ERROR:
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
diff --git a/src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c b/src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c
index 317efdec9c..81fd91ed9d 100644
--- a/src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c
+++ b/src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c
@@ -40,7 +40,7 @@ int orte_gpr_replica_process_command_buffer(orte_buffer_t *input_buffer,
 {
     orte_buffer_t *answer;
     orte_gpr_cmd_flag_t command;
-    int32_t ret, rc, rc2;
+    int rc, ret, rc2;
     size_t n;
     bool compound_cmd=false;
 
@@ -309,7 +309,7 @@ int orte_gpr_replica_process_command_buffer(orte_buffer_t *input_buffer,
         }
         
         ret = ORTE_SUCCESS;
-        if (ORTE_SUCCESS != (rc = orte_dps.pack(*output_buffer, &ret, 1, ORTE_INT32))) {
+        if (ORTE_SUCCESS != (rc = orte_dps.pack(*output_buffer, &ret, 1, ORTE_INT))) {
             ORTE_ERROR_LOG(rc);
             goto RETURN_ERROR;
         }
@@ -331,10 +331,10 @@ RETURN_ERROR:
          ORTE_ERROR_LOG(rc2);
     }
     if (ORTE_SUCCESS != ret) {
-        orte_dps.pack(answer, &ret, 1, ORTE_INT32);
+        orte_dps.pack(answer, &ret, 1, ORTE_INT);
         return rc;
     }
-    orte_dps.pack(answer, &rc, 1, ORTE_INT32);
+    orte_dps.pack(answer, &rc, 1, ORTE_INT);
     return rc;
 }
 
diff --git a/src/mca/gpr/replica/communications/gpr_replica_del_index_cm.c b/src/mca/gpr/replica/communications/gpr_replica_del_index_cm.c
index 201147f2fa..a6b7080db3 100644
--- a/src/mca/gpr/replica/communications/gpr_replica_del_index_cm.c
+++ b/src/mca/gpr/replica/communications/gpr_replica_del_index_cm.c
@@ -36,8 +36,7 @@ int orte_gpr_replica_recv_delete_segment_cmd(orte_buffer_t *buffer, orte_buffer_
     char *segment=NULL;
     orte_gpr_replica_segment_t *seg=NULL;
     size_t n;
-    int rc;
-    int32_t ret;
+    int rc, ret;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &command, 1, ORTE_GPR_CMD))) {
         ORTE_ERROR_LOG(rc);
@@ -60,7 +59,7 @@ int orte_gpr_replica_recv_delete_segment_cmd(orte_buffer_t *buffer, orte_buffer_
     }
 
  RETURN_ERROR:
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
@@ -75,8 +74,7 @@ int orte_gpr_replica_recv_delete_entries_cmd(orte_buffer_t *buffer, orte_buffer_
     orte_gpr_replica_itag_t *token_itags=NULL, *key_itags=NULL;
     orte_gpr_replica_segment_t *seg=NULL;
     char *segment=NULL, **tokens=NULL, **keys=NULL;
-    int32_t num_tokens=0, num_keys=0, ret;
-    int rc, i;
+    int num_tokens=0, num_keys=0, rc, i, ret;
     size_t n;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &command, 1, ORTE_GPR_CMD))) {
@@ -97,7 +95,7 @@ int orte_gpr_replica_recv_delete_entries_cmd(orte_buffer_t *buffer, orte_buffer_
     }
 
     n = 1;
-    if (ORTE_SUCCESS != (ret = orte_dps.unpack(buffer, &num_tokens, &n, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (ret = orte_dps.unpack(buffer, &num_tokens, &n, ORTE_INT))) {
         ORTE_ERROR_LOG(ret);
         goto RETURN_ERROR;
     }
@@ -118,7 +116,7 @@ int orte_gpr_replica_recv_delete_entries_cmd(orte_buffer_t *buffer, orte_buffer_
      }
 
     n = 1;
-    if (ORTE_SUCCESS != (ret = orte_dps.unpack(buffer, &num_keys, &n, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (ret = orte_dps.unpack(buffer, &num_keys, &n, ORTE_INT))) {
         ORTE_ERROR_LOG(ret);
         goto RETURN_ERROR;
     }
@@ -190,7 +188,7 @@ int orte_gpr_replica_recv_delete_entries_cmd(orte_buffer_t *buffer, orte_buffer_
         free(key_itags);
     }
 
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
@@ -206,8 +204,7 @@ int orte_gpr_replica_recv_index_cmd(orte_buffer_t *buffer,
     size_t n, cnt;
     orte_gpr_replica_segment_t *seg=NULL;
     char *segment=NULL, **index=NULL;
-    int rc;
-    int32_t ret;
+    int rc, ret;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &command, 1, ORTE_GPR_CMD))) {
         ORTE_ERROR_LOG(rc);
@@ -272,7 +269,7 @@ RETURN_PACK_ERROR:
        free(index);
     }
     
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
diff --git a/src/mca/gpr/replica/communications/gpr_replica_put_get_cm.c b/src/mca/gpr/replica/communications/gpr_replica_put_get_cm.c
index ee4c6a38f3..b99d637938 100644
--- a/src/mca/gpr/replica/communications/gpr_replica_put_get_cm.c
+++ b/src/mca/gpr/replica/communications/gpr_replica_put_get_cm.c
@@ -38,8 +38,7 @@ int orte_gpr_replica_recv_put_cmd(orte_buffer_t *buffer, orte_buffer_t *answer)
     orte_gpr_replica_itag_t *itags=NULL;
     orte_data_type_t type;
     int8_t action_taken=0;
-    int i=0, rc;
-    int32_t ret;
+    int i=0, rc, ret;
     size_t cnt;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &command, 1, ORTE_GPR_CMD))) {
@@ -126,7 +125,7 @@ int orte_gpr_replica_recv_put_cmd(orte_buffer_t *buffer, orte_buffer_t *answer)
         free(values);
     }
     
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(answer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
@@ -141,9 +140,9 @@ int orte_gpr_replica_recv_get_cmd(orte_buffer_t *input_buffer,
     orte_gpr_addr_mode_t addr_mode;
     orte_gpr_replica_segment_t *seg=NULL;
     orte_gpr_replica_itag_t *tokentags=NULL, *keytags=NULL;
-    int32_t num_tokens=0, num_keys=0, rc, ret, cnt=0;
+    int num_tokens=0, num_keys=0, rc, ret;
     char *segment=NULL, **tokens=NULL, **keys=NULL;
-    int i=0;
+    int i=0, cnt=0;
     size_t n;
     orte_gpr_value_t **values=NULL;
 
@@ -165,7 +164,7 @@ int orte_gpr_replica_recv_get_cmd(orte_buffer_t *input_buffer,
     }
 
     n = 1;
-    if (ORTE_SUCCESS != (ret = orte_dps.unpack(input_buffer, &num_tokens, &n, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (ret = orte_dps.unpack(input_buffer, &num_tokens, &n, ORTE_INT))) {
         ORTE_ERROR_LOG(ret);
         goto RETURN_ERROR;
     }
@@ -188,7 +187,7 @@ int orte_gpr_replica_recv_get_cmd(orte_buffer_t *input_buffer,
     }
 
     n = 1;
-    if (ORTE_SUCCESS != (ret = orte_dps.unpack(input_buffer, &num_keys, &n, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (ret = orte_dps.unpack(input_buffer, &num_keys, &n, ORTE_INT))) {
         ORTE_ERROR_LOG(ret);
         goto RETURN_ERROR;
     }
@@ -241,7 +240,7 @@ int orte_gpr_replica_recv_get_cmd(orte_buffer_t *input_buffer,
  RETURN_ERROR:
 
     /* pack the number of values */
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &cnt, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &cnt, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         ret = rc;
     }
@@ -289,7 +288,7 @@ int orte_gpr_replica_recv_get_cmd(orte_buffer_t *input_buffer,
     }
  
     /* pack response code */
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
     }
 
diff --git a/src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c b/src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c
index 872d60c445..dca59b4666 100644
--- a/src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c
+++ b/src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c
@@ -39,8 +39,7 @@ int orte_gpr_replica_recv_subscribe_cmd(orte_process_name_t* sender,
     orte_gpr_cmd_flag_t command=ORTE_GPR_SUBSCRIBE_CMD;
     orte_data_type_t type;
     orte_gpr_notify_id_t local_idtag=ORTE_GPR_NOTIFY_ID_MAX, idtag=ORTE_GPR_NOTIFY_ID_MAX;
-    int32_t rc;
-    int ret, num_subs, num_trigs;
+    int rc, ret, num_subs, num_trigs;
     size_t n;
     orte_gpr_notify_action_t action;
     orte_gpr_value_t **trigs;
@@ -149,7 +148,7 @@ int orte_gpr_replica_recv_subscribe_cmd(orte_process_name_t* sender,
         goto RETURN_ERROR;
     }
 
-    if (ORTE_SUCCESS != (ret = orte_dps.pack(output_buffer, &rc, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (ret = orte_dps.pack(output_buffer, &rc, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(ret);
         return ret;
     }
@@ -162,8 +161,7 @@ int orte_gpr_replica_recv_unsubscribe_cmd(orte_buffer_t *input_buffer,
 {
     orte_gpr_cmd_flag_t command=ORTE_GPR_UNSUBSCRIBE_CMD;
     orte_gpr_notify_id_t sub_number=0;
-    int rc;
-    int32_t ret;
+    int rc, ret;
     size_t n;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &command, 1, ORTE_GPR_CMD))) {
@@ -184,7 +182,7 @@ int orte_gpr_replica_recv_unsubscribe_cmd(orte_buffer_t *input_buffer,
     }
 
 RETURN_ERROR:
-    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT32))) {
+    if (ORTE_SUCCESS != (rc = orte_dps.pack(output_buffer, &ret, 1, ORTE_INT))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }