Some cleanups.