Changes to make it work with Fedora