Minor random cleanups (nw)