Minor none sf fixes

Merge request reports

Loading