General fixes

Merged Uriel Mayo requested to merge generalFixes into 15.0-stage

Merge request reports