Fixes and cleanups.