two minor cleanups