diff --git a/ompi/mca/io/ompio/io_ompio.h b/ompi/mca/io/ompio/io_ompio.h
index 966e7d50e8..1933316b6e 100644
--- a/ompi/mca/io/ompio/io_ompio.h
+++ b/ompi/mca/io/ompio/io_ompio.h
@@ -81,6 +81,7 @@ BEGIN_C_DECLS
 
 enum ompio_fs_type
 {
+    NONE = 0,
     UFS = 1,
     PVFS2 = 2,
     LUSTRE = 3
diff --git a/ompi/mca/io/ompio/io_ompio_file_open.c b/ompi/mca/io/ompio/io_ompio_file_open.c
index dd3151c251..847f01ad02 100644
--- a/ompi/mca/io/ompio/io_ompio_file_open.c
+++ b/ompi/mca/io/ompio/io_ompio_file_open.c
@@ -101,7 +101,7 @@ mca_io_ompio_file_open (ompi_communicator_t *comm,
     remote_arch = opal_local_arch;
     data->ompio_fh.f_convertor = opal_convertor_create (remote_arch, 0);
 
-    data->ompio_fh.f_fstype = 0;
+    data->ompio_fh.f_fstype = NONE;
 
     if (OMPI_SUCCESS != (ret = mca_fs_base_file_select (&data->ompio_fh, 
                                                         NULL))) {
diff --git a/opal/mca/paffinity/hwloc/paffinity_hwloc_module.c b/opal/mca/paffinity/hwloc/paffinity_hwloc_module.c
index 9bea32b5de..9c0744d4e4 100644
--- a/opal/mca/paffinity/hwloc/paffinity_hwloc_module.c
+++ b/opal/mca/paffinity/hwloc/paffinity_hwloc_module.c
@@ -462,7 +462,7 @@ static int module_get_core_info(int socket, int *num_cores)
 static int module_get_physical_processor_id(int logical_processor_id,
                                             int *physical_processor_id)
 {
-    int obj_type = HWLOC_OBJ_CORE;
+    hwloc_obj_type_t obj_type = HWLOC_OBJ_CORE;
     hwloc_obj_t obj;
     hwloc_bitmap_t good;
     hwloc_topology_t *t;
diff --git a/opal/util/opal_sos.c b/opal/util/opal_sos.c
index 312fa2e6f0..deadcf968d 100644
--- a/opal/util/opal_sos.c
+++ b/opal/util/opal_sos.c
@@ -310,13 +310,14 @@ int opal_sos_reporter(const char *file, int line, const char *func,
 void
 opal_sos_report_error(opal_sos_error_t *error)
 {
-    int severity, errnum, ret;
+    opal_sos_severity_t severity;
     char *pretty_error;
+    int errnum, ret;
 
     if (NULL == error)
         return;
 
-    severity = OPAL_SOS_GET_SEVERITY(error->errnum);
+    severity = (opal_sos_severity_t)OPAL_SOS_GET_SEVERITY(error->errnum);
 
     /* An OPAL SOS encoded error number holds no meaning outside
      * the context of Open MPI. We convert it back to the native
diff --git a/orte/mca/notifier/command/notifier_command_child.c b/orte/mca/notifier/command/notifier_command_child.c
index 988966bcb1..fab88a9ce8 100644
--- a/orte/mca/notifier/command/notifier_command_child.c
+++ b/orte/mca/notifier/command/notifier_command_child.c
@@ -194,7 +194,7 @@ static void *stdin_main(opal_object_t *obj)
 
     asprintf(&data, "<stdin>\n<notifier severity_int=\"%d\" severity_str=\"%s\" errcode=\"%d\">\n<message>%s</message>\n</notifier>\n</stdin>\n",
              arg->sat_severity,
-             orte_notifier_base_sev2str(arg->sat_severity),
+             orte_notifier_base_sev2str((orte_notifier_base_severity_t)arg->sat_severity),
              arg->sat_errcode,
              arg->sat_msg);
     if (NULL != data) {
@@ -289,7 +289,7 @@ static void do_exec(void)
         while (NULL != (p = strstr(cmd, "$S"))) {
             *p = '\0';
             asprintf(&temp, "%s%s%s", cmd, 
-                     orte_notifier_base_sev2str(sel[0]), p + 2);
+                     orte_notifier_base_sev2str((orte_notifier_base_severity_t)sel[0]), p + 2);
             free(cmd);
             cmd = temp;
         }