Little cleanups.