Update mpiicc etc. for consistency