Minor updates and cleanups.