More fixes to the dag.