fixes to new DO