Fix per pull request comments