Fix pull request errors