Addressed issues that came to light in the pull request