Fixes for comments based on pull request.