Fix some issues

Matthieu Boileau requested to merge fixes into master

Merge request reports