fix 2 more (nw)