Fix r30269 regressions (nw)