some fixes (nw)