Merge pull request #4009 from klauskiwi/fedora33_fixes

Fedora 33 fixes