Additional cleanups.