Tweaks requested from PR