Just some minor cleanups.