Fixes for build on Fedora