Fix review comments.
Merge pull request #937 from pasinskim/master

Fix review comments.