Minor fixes to pull request.