Fixes for comments on Pull Request.