Fixing more things Straffin found

Merge request reports

Loading