various fixes

Created originally on Bitbucket by ubbut

Was already merged in Bitbucket before import, marked as merged by the import user

Merge request reports

Loading