Misc cleanups (nw)