various minor cleanups