Tweaks to chs 21 and 25 per Franci.