address pull request issues