Small fixes 2

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

Merge request reports