updates due to changes in dune-stuff