diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in
index 98bf2e85bdd..79fcd418ff1 100644
--- a/ompi/include/mpi.h.in
+++ b/ompi/include/mpi.h.in
@@ -880,8 +880,9 @@ typedef enum ompi_mpi_t_source_order_t MPI_T_source_order;
 typedef void (*MPI_T_event_free_cb_function) (MPI_T_event_registration handle,
                                               MPI_T_cb_safety cb_safety,
                                               void *user_data);
-typedef void (*MPI_T_event_dropped_cb_function) (int count,
+typedef void (*MPI_T_event_dropped_cb_function) (MPI_Count count,
                                                  MPI_T_event_registration handle,
+                                                 int source_index,
                                                  MPI_T_cb_safety cb_safety,
                                                  void *user_data);
 typedef void (*MPI_T_event_cb_function) (MPI_T_event_instance event,
diff --git a/ompi/mpi/tool/event_get_info.c b/ompi/mpi/tool/event_get_info.c
index 98b8862c034..123867f3d48 100644
--- a/ompi/mpi/tool/event_get_info.c
+++ b/ompi/mpi/tool/event_get_info.c
@@ -34,7 +34,7 @@ int MPI_T_event_get_info (int event_index, char *name, int *name_len,
                           char *desc, int *desc_len, int *bind)
 {
     mca_base_event_t * const event;
-    int ret, max_datatypes = 0;
+    int ret, max_datatypes = 0, current_displacement = 0;
 
     if (!mpit_is_initialized ()) {
         return MPI_T_ERR_NOT_INITIALIZED;
@@ -114,7 +114,7 @@ int MPI_T_event_get_info (int event_index, char *name, int *name_len,
             *num_elements = max_datatypes;
         }
 
-        if (verbosity) {
+        if (NULL != verbosity) {
             *verbosity = event->event_verbosity;
         }
 
diff --git a/opal/mca/base/mca_base_event.c b/opal/mca/base/mca_base_event.c
index fa96b1f49f2..ee176734f85 100644
--- a/opal/mca/base/mca_base_event.c
+++ b/opal/mca/base/mca_base_event.c
@@ -148,7 +148,7 @@ int mca_base_registration_get_event (mca_base_event_registration_t *registration
 
 static int mca_base_event_get_by_index_internal (int index, mca_base_event_t **event, bool invalidok)
 {
-    if (index >= event_count) {
+    if (0 > index || index >= event_count) {
         return OPAL_ERR_VALUE_OUT_OF_BOUNDS;
     }