Fix some things for pull request revision