Tweaks from PR feedback