Fixes for Fedora 22