Minor fixes and cleanups.