Fix #1, #8 and #9

Merge request reports

Loading