Minor tweaks and cleanups.
Minor tweaks and fixes.