Address issues with pull request;