More fixes (nw)