fixed warnings
Merge pull request #1944 from ilya-lavrenov:minor_commits