PR review fixes.