Fix some issues

Merged Matthieu Boileau requested to merge fixes into master

Merge request reports