Fix Pull Request comments