Clean up build errors related to BOOST and PETSC merge