Fix review comments on pull request