other minor cleanups