PR review tweaks.