Fixes for OpenEMPI update