Tweaks based on feedback from Szelena.