A few minor cleanups