fix some bugs

Viktor Klochkov requested to merge dev into master

Merge request reports