Tweaks based on comments.