Tweaks from feedback.