Fix pull request commits in some side cases