Some cleanups added.