more clazy fixes

Waqar Ahmedrequested to merge
work/clazy_fixes_more into master

Merge request reports