Added a lot of fixes back in da.yaml

When the master branch moved to 2.0, a lot of fixes was lost/not moved into the 1.3 branch.
This adds them back in.