Fixes for using a <#>-built MPICH