Various fixes

Boris Budinirequested to merge
dev into master

Merge request reports