Yet another part of review fixes.
Merge pull request #940 from pasinskim/master

Yet another part of review fixes.