Cleanups and updates.