fix CI failures on recent Fedora 33 image
This incorporates fixes from !1369 (closed) and #1135 (closed).
Fixes: #1135 (closed), #1136 (closed)
Checklist
-
Commits have
Signed-off-by:with name/author being identical to the commit author - Code modified for feature
- Test suite updated with functionality tests
- Test suite updated with negative tests
- Documentation updated / NEWS entry present (for non-trivial changes)
- CI timeout is 2h or higher (see Settings/CICD/General pipelines/Timeout)
Reviewer's checklist:
- Any issues marked for closing are addressed
- There is a test suite reasonably covering new functionality or modifications
-
Function naming, parameters, return values, types, etc., are consistent and according to
CONTRIBUTION.md - This feature/change has adequate documentation added
- No obvious mistakes in the code