Do minor cleanups.