Misc fixes

Merged Bastien Nocera requested to merge wip/hadess/misc-fixes into master

Merge request reports