Tweaks to the last PR.