Fixes for fedora 20