Dmitriy/minor fixes

Andrey Veltischev requested to merge dmitriy/minor_fixes into master

Merge request reports