Tweaks and clean-up.