Miscellaneous updates and cleanups.