Fixes for Fedora.  Maybe breaks on Travis?