More tweaks based on ER feedback.