Fix pull request comments from jaypipes