Tweaks and other small changes.