Cleanups and corrections.