Fixes

Merged Matias Guijarro requested to merge fixes into master

Merge request reports