Fixed assorted wd17xx related regressions (nw)