More progress on Windows MPI directives