assorted minor cleanups