Fixing issues from pull request