Adjustments to make it work on Fedora