A pair of patches for problems in current Fedora Rawhide

Please, review this pull request ASAP.