Fix Andrew's pull request comments