Implemented fixes suggested by Paul

Merge request reports

Loading