Minor fixes, nw