Updates to allow operation with OpenFOAM 6 and 8.