Fixes for supporting both Fedora and Centos