diff --git a/src/mca/bmi/sm/.ompi_unignore b/src/mca/bmi/sm/.ompi_unignore
index cef743e658..fe33c52e43 100644
--- a/src/mca/bmi/sm/.ompi_unignore
+++ b/src/mca/bmi/sm/.ompi_unignore
@@ -1,2 +1,3 @@
 twoodall
 gshipman
+bosilca
diff --git a/src/mca/bmi/sm/bmi_sm.c b/src/mca/bmi/sm/bmi_sm.c
index 309256f36f..8179f7dae5 100644
--- a/src/mca/bmi/sm/bmi_sm.c
+++ b/src/mca/bmi/sm/bmi_sm.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include "threads/mutex.h"
-#include "datatype/datatype.h"
+#include "datatype/convertor.h"
 #include "include/sys/atomic.h"
 #include "util/output.h"
 #include "util/if.h"
@@ -780,7 +780,7 @@ struct mca_bmi_base_descriptor_t* mca_bmi_sm_prepare_src(
     mca_bmi_sm_frag_t* frag;
     struct iovec iov;
     uint32_t iov_count = 1;
-    uint32_t max_data = *size;
+    size_t max_data = *size;
     int32_t free_after;
     int rc;