- added fixes from fedora