some mess regression fixes (nw)