Fix issues from feedback

Merge request reports

Loading