First attempt at fixing build errors for Cray MPICH2