more fixes (nw)