Fixing MPI+CUDA and build system