Fix pull request issues
merge