Tweaks based on feedback.