Minor changes, nw