diff --git a/ompi/debuggers/dlopen_test.c b/ompi/debuggers/dlopen_test.c
index 266a1c24389..27ef62c5a63 100644
--- a/ompi/debuggers/dlopen_test.c
+++ b/ompi/debuggers/dlopen_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "opal/runtime/opal.h"
 #include "opal/mca/dl/base/base.h"
diff --git a/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c b/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c
index 3d2ce6b39df..8ec536bcb7f 100644
--- a/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c
+++ b/ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c
@@ -13,6 +13,7 @@
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
+ * Copyright (c) 2018      Cisco Systems, Inc.  All rights reserved
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -1162,7 +1163,7 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i
         int block_index       = -1;
         int blocklength_size  = INIT_LEN;
 
-        ptrdiff_t send_mem_address  = NULL;
+        ptrdiff_t send_mem_address  = (ptrdiff_t) NULL;
         ompi_datatype_t *newType    = MPI_DATATYPE_NULL;
         blocklength_proc            = (int *)       calloc (blocklength_size, sizeof (int));
         displs_proc                 = (ptrdiff_t *) calloc (blocklength_size, sizeof (ptrdiff_t));
diff --git a/opal/datatype/opal_datatype_dump.c b/opal/datatype/opal_datatype_dump.c
index 8ec86ee63a8..d469f8291dc 100644
--- a/opal/datatype/opal_datatype_dump.c
+++ b/opal/datatype/opal_datatype_dump.c
@@ -12,6 +12,7 @@
  *                         All rights reserved.
  * Copyright (c) 2009      Sun Microsystems, Inc. All rights reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2018      Cisco Systems, Inc.  All rights reserved
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -46,7 +47,7 @@ int opal_datatype_contain_basic_datatypes( const opal_datatype_t* pData, char* p
             if( NULL == pData->ptypes ) {
                 index += snprintf( ptr + index, length - index, "%s:* ", opal_datatype_basicDatatypes[i]->name );
             } else {
-                index += snprintf( ptr + index, length - index, "%s:%lu ", opal_datatype_basicDatatypes[i]->name,
+                index += snprintf( ptr + index, length - index, "%s:%" PRIsize_t " ", opal_datatype_basicDatatypes[i]->name,
                                    pData->ptypes[i]);
             }
         }
diff --git a/opal/mca/pmix/pmix3x/pmix/src/util/name_fns.c b/opal/mca/pmix/pmix3x/pmix/src/util/name_fns.c
index b0c69c5da11..49c0f7e8a8f 100644
--- a/opal/mca/pmix/pmix3x/pmix/src/util/name_fns.c
+++ b/opal/mca/pmix/pmix3x/pmix/src/util/name_fns.c
@@ -13,6 +13,7 @@
  * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
+ * Copyright (c) 2018      Cisco Systems, Inc.  All rights reserved
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -31,7 +32,7 @@
 #include "src/util/name_fns.h"
 #include "src/util/printf.h"
 
-#define PMIX_PRINT_NAME_ARGS_MAX_SIZE   50
+#define PMIX_PRINT_NAME_ARGS_MAX_SIZE   300
 #define PMIX_PRINT_NAME_ARG_NUM_BUFS    16
 
 #define PMIX_SCHEMA_DELIMITER_CHAR      '.'