Small changes to account for updates in Dolfin