f22f8ea fixes for fedora