fixing some recent issues

based on @mahogony's help

Merge request reports

Loading