Changes from fedora