more clazy fixes

Waqar Ahmedrequested to merge
work/more_clazy into master

Merge request reports