fixes to work on Fedora