Refactoring: small fixes and improvements

Merge request reports

Loading