fixes

Ilya Dyakun requested to merge fixes2 into fixes

Merge request reports