Minor fixes

In request to the comments for the pull request.