Changes from PR review