Fixes to DN16 and DN17 by Nay