[FIX] Two fixes to see how it goes

Merged Gabriel Davini requested to merge 8.0-small_fixes into 8.0-stage

Merge request reports