Small fixes

Merged Javier Antonio Mendoza Carter requested to merge small-fixes into master

Merge request reports