Small fixes

Merged Amir MOHAMMADI requested to merge small-fixes into master

Merge request reports