Address comments in the PR.