Various fixes

Merged Jakub Jirutka requested to merge github/fork/jirutka/fixes into master

Merge request reports