Misc cleanups of the day (nw)