Fixes for compilation issues on fedora