Updates based on the PR comments.