Corrections from PR review