More changes to upgrade to the latest version of Petsc