Fixed pull request issues