No-MPI problems

There are some problems when compiled without MPI. This needs to be fixed.