Updated to work with current dev version of DOLFIN