Bug fixes

Merged Piotr Gawron requested to merge bugs into master

Merge request reports